From 195d5e53fdab08c49a061a8c548ba89d77c4eee2 Mon Sep 17 00:00:00 2001 From: aedanmills <40202903+aedanmills@users.noreply.github.com> Date: Wed, 11 Jun 2025 17:24:56 -0400 Subject: [PATCH] Cleanup to comply with conventions. --- keyboards/whirlwind_fx_element/config.h | 3 - keyboards/whirlwind_fx_element/keyboard.json | 221 +++++++++--------- .../keymaps/default/keymap.c | 3 +- keyboards/whirlwind_fx_element/rules.mk | 2 - .../whirlwind_fx_element.c | 13 +- 5 files changed, 120 insertions(+), 122 deletions(-) diff --git a/keyboards/whirlwind_fx_element/config.h b/keyboards/whirlwind_fx_element/config.h index 07d91c35570..949ec72b270 100644 --- a/keyboards/whirlwind_fx_element/config.h +++ b/keyboards/whirlwind_fx_element/config.h @@ -9,6 +9,3 @@ #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND #define RGB_MATRIX_DISABLE_SHARED_KEYCODES -#define RGB_MATRIX_DEFAULT_SPEED 0 - -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING diff --git a/keyboards/whirlwind_fx_element/keyboard.json b/keyboards/whirlwind_fx_element/keyboard.json index 8ed4cddfea6..7a2c9674588 100644 --- a/keyboards/whirlwind_fx_element/keyboard.json +++ b/keyboards/whirlwind_fx_element/keyboard.json @@ -24,6 +24,117 @@ "pid": "0xA33E", "device_version": "1.0.6" }, + + "layouts": { + "LAYOUT_fullsize_ansi": { + "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": [1, 0], "x": 15.25, "y": 0}, + {"matrix": [1, 1], "x": 16.25, "y": 0}, + {"matrix": [1, 2], "x": 17.25, "y": 0}, + {"matrix": [1, 3], "x": 0, "y": 1.25}, + {"matrix": [1, 4], "x": 1, "y": 1.25}, + {"matrix": [1, 5], "x": 2, "y": 1.25}, + {"matrix": [1, 6], "x": 3, "y": 1.25}, + {"matrix": [1, 7], "x": 4, "y": 1.25}, + {"matrix": [1, 8], "x": 5, "y": 1.25}, + {"matrix": [1, 9], "x": 6, "y": 1.25}, + {"matrix": [1, 10], "x": 7, "y": 1.25}, + {"matrix": [1, 11], "x": 8, "y": 1.25}, + {"matrix": [1, 12], "x": 9, "y": 1.25}, + {"matrix": [2, 0], "x": 10, "y": 1.25}, + {"matrix": [2, 1], "x": 11, "y": 1.25}, + {"matrix": [2, 2], "x": 12, "y": 1.25}, + {"matrix": [2, 3], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 4], "x": 15.25, "y": 1.25}, + {"matrix": [2, 5], "x": 16.25, "y": 1.25}, + {"matrix": [2, 6], "x": 17.25, "y": 1.25}, + {"matrix": [2, 7], "x": 18.5, "y": 1.25}, + {"matrix": [2, 8], "x": 19.5, "y": 1.25}, + {"matrix": [2, 9], "x": 20.5, "y": 1.25}, + {"matrix": [2, 10], "x": 21.5, "y": 1.25}, + {"matrix": [2, 11], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 12], "x": 1.5, "y": 2.25}, + {"matrix": [3, 0], "x": 2.5, "y": 2.25}, + {"matrix": [3, 1], "x": 3.5, "y": 2.25}, + {"matrix": [3, 2], "x": 4.5, "y": 2.25}, + {"matrix": [3, 3], "x": 5.5, "y": 2.25}, + {"matrix": [3, 4], "x": 6.5, "y": 2.25}, + {"matrix": [3, 5], "x": 7.5, "y": 2.25}, + {"matrix": [3, 6], "x": 8.5, "y": 2.25}, + {"matrix": [3, 7], "x": 9.5, "y": 2.25}, + {"matrix": [3, 8], "x": 10.5, "y": 2.25}, + {"matrix": [3, 9], "x": 11.5, "y": 2.25}, + {"matrix": [3, 10], "x": 12.5, "y": 2.25}, + {"matrix": [3, 11], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 12], "x": 15.25, "y": 2.25}, + {"matrix": [4, 0], "x": 16.25, "y": 2.25}, + {"matrix": [4, 1], "x": 17.25, "y": 2.25}, + {"matrix": [4, 2], "x": 18.5, "y": 2.25}, + {"matrix": [4, 3], "x": 19.5, "y": 2.25}, + {"matrix": [4, 4], "x": 20.5, "y": 2.25}, + {"matrix": [5, 8], "x": 21.5, "y": 2.25, "h": 2}, + {"matrix": [4, 5], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [4, 6], "x": 1.75, "y": 3.25}, + {"matrix": [4, 7], "x": 2.75, "y": 3.25}, + {"matrix": [4, 8], "x": 3.75, "y": 3.25}, + {"matrix": [4, 9], "x": 4.75, "y": 3.25}, + {"matrix": [4, 10], "x": 5.75, "y": 3.25}, + {"matrix": [4, 11], "x": 6.75, "y": 3.25}, + {"matrix": [4, 12], "x": 7.75, "y": 3.25}, + {"matrix": [5, 0], "x": 8.75, "y": 3.25}, + {"matrix": [5, 1], "x": 9.75, "y": 3.25}, + {"matrix": [5, 2], "x": 10.75, "y": 3.25}, + {"matrix": [5, 3], "x": 11.75, "y": 3.25}, + {"matrix": [5, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [5, 5], "x": 18.5, "y": 3.25}, + {"matrix": [5, 6], "x": 19.5, "y": 3.25}, + {"matrix": [5, 7], "x": 20.5, "y": 3.25}, + {"matrix": [5, 9], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [5, 10], "x": 2.25, "y": 4.25}, + {"matrix": [5, 11], "x": 3.25, "y": 4.25}, + {"matrix": [5, 12], "x": 4.25, "y": 4.25}, + {"matrix": [6, 0], "x": 5.25, "y": 4.25}, + {"matrix": [6, 1], "x": 6.25, "y": 4.25}, + {"matrix": [6, 2], "x": 7.25, "y": 4.25}, + {"matrix": [6, 3], "x": 8.25, "y": 4.25}, + {"matrix": [6, 4], "x": 9.25, "y": 4.25}, + {"matrix": [6, 5], "x": 10.25, "y": 4.25}, + {"matrix": [6, 6], "x": 11.25, "y": 4.25}, + {"matrix": [6, 7], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [6, 8], "x": 16.25, "y": 4.25}, + {"matrix": [6, 9], "x": 18.5, "y": 4.25}, + {"matrix": [6, 10], "x": 19.5, "y": 4.25}, + {"matrix": [6, 11], "x": 20.5, "y": 4.25}, + {"matrix": [6, 12], "x": 21.5, "y": 4.25, "h": 2}, + {"matrix": [7, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [7, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [7, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [7, 3], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [7, 4], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [7, 5], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [7, 6], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [7, 7], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [7, 8], "x": 15.25, "y": 5.25}, + {"matrix": [7, 9], "x": 16.25, "y": 5.25}, + {"matrix": [7, 10], "x": 17.25, "y": 5.25}, + {"matrix": [7, 11], "x": 18.5, "y": 5.25, "w": 2}, + {"matrix": [7, 12], "x": 20.5, "y": 5.25} + ] + } + }, "rgb_matrix": { "driver": "is31fl3741", "max_brightness": 200, @@ -185,115 +296,5 @@ "led_process_limit": 4, "led_flush_limit": 26, "sleep": true - }, - "layouts": { - "LAYOUT_fullsize_ansi": { - "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": [1, 0], "x": 15.25, "y": 0}, - {"matrix": [1, 1], "x": 16.25, "y": 0}, - {"matrix": [1, 2], "x": 17.25, "y": 0}, - {"matrix": [1, 3], "x": 0, "y": 1.25}, - {"matrix": [1, 4], "x": 1, "y": 1.25}, - {"matrix": [1, 5], "x": 2, "y": 1.25}, - {"matrix": [1, 6], "x": 3, "y": 1.25}, - {"matrix": [1, 7], "x": 4, "y": 1.25}, - {"matrix": [1, 8], "x": 5, "y": 1.25}, - {"matrix": [1, 9], "x": 6, "y": 1.25}, - {"matrix": [1, 10], "x": 7, "y": 1.25}, - {"matrix": [1, 11], "x": 8, "y": 1.25}, - {"matrix": [1, 12], "x": 9, "y": 1.25}, - {"matrix": [2, 0], "x": 10, "y": 1.25}, - {"matrix": [2, 1], "x": 11, "y": 1.25}, - {"matrix": [2, 2], "x": 12, "y": 1.25}, - {"matrix": [2, 3], "x": 13, "y": 1.25, "w": 2}, - {"matrix": [2, 4], "x": 15.25, "y": 1.25}, - {"matrix": [2, 5], "x": 16.25, "y": 1.25}, - {"matrix": [2, 6], "x": 17.25, "y": 1.25}, - {"matrix": [2, 7], "x": 18.5, "y": 1.25}, - {"matrix": [2, 8], "x": 19.5, "y": 1.25}, - {"matrix": [2, 9], "x": 20.5, "y": 1.25}, - {"matrix": [2, 10], "x": 21.5, "y": 1.25}, - {"matrix": [2, 11], "x": 0, "y": 2.25, "w": 1.5}, - {"matrix": [2, 12], "x": 1.5, "y": 2.25}, - {"matrix": [3, 0], "x": 2.5, "y": 2.25}, - {"matrix": [3, 1], "x": 3.5, "y": 2.25}, - {"matrix": [3, 2], "x": 4.5, "y": 2.25}, - {"matrix": [3, 3], "x": 5.5, "y": 2.25}, - {"matrix": [3, 4], "x": 6.5, "y": 2.25}, - {"matrix": [3, 5], "x": 7.5, "y": 2.25}, - {"matrix": [3, 6], "x": 8.5, "y": 2.25}, - {"matrix": [3, 7], "x": 9.5, "y": 2.25}, - {"matrix": [3, 8], "x": 10.5, "y": 2.25}, - {"matrix": [3, 9], "x": 11.5, "y": 2.25}, - {"matrix": [3, 10], "x": 12.5, "y": 2.25}, - {"matrix": [3, 11], "x": 13.5, "y": 2.25, "w": 1.5}, - {"matrix": [3, 12], "x": 15.25, "y": 2.25}, - {"matrix": [4, 0], "x": 16.25, "y": 2.25}, - {"matrix": [4, 1], "x": 17.25, "y": 2.25}, - {"matrix": [4, 2], "x": 18.5, "y": 2.25}, - {"matrix": [4, 3], "x": 19.5, "y": 2.25}, - {"matrix": [4, 4], "x": 20.5, "y": 2.25}, - {"matrix": [5, 8], "x": 21.5, "y": 2.25, "h": 2}, - {"matrix": [4, 5], "x": 0, "y": 3.25, "w": 1.75}, - {"matrix": [4, 6], "x": 1.75, "y": 3.25}, - {"matrix": [4, 7], "x": 2.75, "y": 3.25}, - {"matrix": [4, 8], "x": 3.75, "y": 3.25}, - {"matrix": [4, 9], "x": 4.75, "y": 3.25}, - {"matrix": [4, 10], "x": 5.75, "y": 3.25}, - {"matrix": [4, 11], "x": 6.75, "y": 3.25}, - {"matrix": [4, 12], "x": 7.75, "y": 3.25}, - {"matrix": [5, 0], "x": 8.75, "y": 3.25}, - {"matrix": [5, 1], "x": 9.75, "y": 3.25}, - {"matrix": [5, 2], "x": 10.75, "y": 3.25}, - {"matrix": [5, 3], "x": 11.75, "y": 3.25}, - {"matrix": [5, 4], "x": 12.75, "y": 3.25, "w": 2.25}, - {"matrix": [5, 5], "x": 18.5, "y": 3.25}, - {"matrix": [5, 6], "x": 19.5, "y": 3.25}, - {"matrix": [5, 7], "x": 20.5, "y": 3.25}, - {"matrix": [5, 9], "x": 0, "y": 4.25, "w": 2.25}, - {"matrix": [5, 10], "x": 2.25, "y": 4.25}, - {"matrix": [5, 11], "x": 3.25, "y": 4.25}, - {"matrix": [5, 12], "x": 4.25, "y": 4.25}, - {"matrix": [6, 0], "x": 5.25, "y": 4.25}, - {"matrix": [6, 1], "x": 6.25, "y": 4.25}, - {"matrix": [6, 2], "x": 7.25, "y": 4.25}, - {"matrix": [6, 3], "x": 8.25, "y": 4.25}, - {"matrix": [6, 4], "x": 9.25, "y": 4.25}, - {"matrix": [6, 5], "x": 10.25, "y": 4.25}, - {"matrix": [6, 6], "x": 11.25, "y": 4.25}, - {"matrix": [6, 7], "x": 12.25, "y": 4.25, "w": 2.75}, - {"matrix": [6, 8], "x": 16.25, "y": 4.25}, - {"matrix": [6, 9], "x": 18.5, "y": 4.25}, - {"matrix": [6, 10], "x": 19.5, "y": 4.25}, - {"matrix": [6, 11], "x": 20.5, "y": 4.25}, - {"matrix": [6, 12], "x": 21.5, "y": 4.25, "h": 2}, - {"matrix": [7, 0], "x": 0, "y": 5.25, "w": 1.25}, - {"matrix": [7, 1], "x": 1.25, "y": 5.25, "w": 1.25}, - {"matrix": [7, 2], "x": 2.5, "y": 5.25, "w": 1.25}, - {"matrix": [7, 3], "x": 3.75, "y": 5.25, "w": 6.25}, - {"matrix": [7, 4], "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [7, 5], "x": 11.25, "y": 5.25, "w": 1.25}, - {"matrix": [7, 6], "x": 12.5, "y": 5.25, "w": 1.25}, - {"matrix": [7, 7], "x": 13.75, "y": 5.25, "w": 1.25}, - {"matrix": [7, 8], "x": 15.25, "y": 5.25}, - {"matrix": [7, 9], "x": 16.25, "y": 5.25}, - {"matrix": [7, 10], "x": 17.25, "y": 5.25}, - {"matrix": [7, 11], "x": 18.5, "y": 5.25, "w": 2}, - {"matrix": [7, 12], "x": 20.5, "y": 5.25} - ] - } } } diff --git a/keyboards/whirlwind_fx_element/keymaps/default/keymap.c b/keyboards/whirlwind_fx_element/keymaps/default/keymap.c index 916ac01f053..36690aca28d 100644 --- a/keyboards/whirlwind_fx_element/keymaps/default/keymap.c +++ b/keyboards/whirlwind_fx_element/keymaps/default/keymap.c @@ -1,4 +1,5 @@ -// Copyright 2023 QMK +// Copyright 2023 WhirlwindFX +// Copyright 2023 aedanmills // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H diff --git a/keyboards/whirlwind_fx_element/rules.mk b/keyboards/whirlwind_fx_element/rules.mk index 411d3aae9ab..b5c9d6520db 100644 --- a/keyboards/whirlwind_fx_element/rules.mk +++ b/keyboards/whirlwind_fx_element/rules.mk @@ -4,5 +4,3 @@ F_CPU = 72000000 BOOTLOADER = stm32-dfu OPT_DEFS = -DSTM32F3 - -LED_INDICATORS = yes diff --git a/keyboards/whirlwind_fx_element/whirlwind_fx_element.c b/keyboards/whirlwind_fx_element/whirlwind_fx_element.c index 8d38d4dabd8..7622412846a 100644 --- a/keyboards/whirlwind_fx_element/whirlwind_fx_element.c +++ b/keyboards/whirlwind_fx_element/whirlwind_fx_element.c @@ -1,8 +1,9 @@ -// Copyright 2023 QMK +// Copyright 2023 WhirlwindFX +// Copyright 2023 aedanmills // SPDX-License-Identifier: GPL-2.0-or-later -#include "config.h" #include QMK_KEYBOARD_H +#include "config.h" #ifdef RGB_MATRIX_ENABLE const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { @@ -114,11 +115,11 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { #endif void keyboard_pre_init_kb(void) { - gpio_set_pin_output(LED_CAPS_LOCK_PIN); - gpio_set_pin_output(LED_NUM_LOCK_PIN); - gpio_set_pin_output(LED_SCROLL_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_NUM_LOCK_PIN); + gpio_set_pin_output(LED_SCROLL_LOCK_PIN); - gpio_set_pin_output(B11); // Required for indicators to work correctly + gpio_set_pin_output(B11); // Required for indicators to work correctly } bool led_update_kb(led_t led_state) {