From 373364afd168be5ee03050690b7a04938f7297c8 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 21 Aug 2024 10:15:06 -0400 Subject: [PATCH] Add Quefrency Rev. 6 (#24291) * Initial commit of Quefrency Rev. 6 * Use more memory for storing VIA layout options * Add missing underglow LED * Set bootmagic keys for each half, split transport matrix for RGB, update pinout for right half * Enable encoders * Add/update license headers * Remove fudge thing * Remove EEPROM leveling specification now that is the default * Fix bootmagic position for right half --- .../quefrency/keymaps/default65/keymap.c | 3 + .../keebio/quefrency/keymaps/via/config.h | 22 +- .../keebio/quefrency/keymaps/via/keymap.c | 3 + keyboards/keebio/quefrency/rev6/config.h | 26 + keyboards/keebio/quefrency/rev6/halconf.h | 10 + keyboards/keebio/quefrency/rev6/keyboard.json | 633 ++++++++++++++++++ keyboards/keebio/quefrency/rev6/mcuconf.h | 14 + keyboards/keebio/quefrency/rev6/rev6.c | 11 + keyboards/keebio/quefrency/rev6/rules.mk | 1 + 9 files changed, 706 insertions(+), 17 deletions(-) create mode 100644 keyboards/keebio/quefrency/rev6/config.h create mode 100644 keyboards/keebio/quefrency/rev6/halconf.h create mode 100644 keyboards/keebio/quefrency/rev6/keyboard.json create mode 100644 keyboards/keebio/quefrency/rev6/mcuconf.h create mode 100644 keyboards/keebio/quefrency/rev6/rev6.c create mode 100644 keyboards/keebio/quefrency/rev6/rules.mk diff --git a/keyboards/keebio/quefrency/keymaps/default65/keymap.c b/keyboards/keebio/quefrency/keymaps/default65/keymap.c index 6515544959..8f7988f6cb 100644 --- a/keyboards/keebio/quefrency/keymaps/default65/keymap.c +++ b/keyboards/keebio/quefrency/keymaps/default65/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2024 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H extern keymap_config_t keymap_config; diff --git a/keyboards/keebio/quefrency/keymaps/via/config.h b/keyboards/keebio/quefrency/keymaps/via/config.h index bb1373dee3..6483c74d1f 100644 --- a/keyboards/keebio/quefrency/keymaps/via/config.h +++ b/keyboards/keebio/quefrency/keymaps/via/config.h @@ -1,20 +1,5 @@ -/* -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 . -*/ +// Copyright 2024 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -32,4 +17,7 @@ along with this program. If not, see . #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 +#elif defined(KEYBOARD_keebio_quefrency_rev6) + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 + #endif diff --git a/keyboards/keebio/quefrency/keymaps/via/keymap.c b/keyboards/keebio/quefrency/keymaps/via/keymap.c index 9a5bf0ff09..b3332717dd 100644 --- a/keyboards/keebio/quefrency/keymaps/via/keymap.c +++ b/keyboards/keebio/quefrency/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2024 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/keebio/quefrency/rev6/config.h b/keyboards/keebio/quefrency/rev6/config.h new file mode 100644 index 0000000000..952033edf1 --- /dev/null +++ b/keyboards/keebio/quefrency/rev6/config.h @@ -0,0 +1,26 @@ +// Copyright 2024 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Defines for the split keyboard setup */ +#define SERIAL_USART_DRIVER SD3 // USART 3 +#define SERIAL_USART_TX_PIN B10 +#define SERIAL_USART_RX_PIN B11 +#define SERIAL_USART_TX_PAL_MODE 7 +#define SERIAL_USART_RX_PAL_MODE 7 +#define SERIAL_USART_FULL_DUPLEX +#define SERIAL_USART_PIN_SWAP + +#define USB_VBUS_PIN C6 +#define SPLIT_HAND_PIN A0 + +/* Defines for the RGB matrix */ +#ifdef RGB_MATRIX_ENABLE +# define WS2812_PWM_DRIVER PWMD3 +# define WS2812_PWM_CHANNEL 4 +# define WS2812_PWM_PAL_MODE 10 +# define WS2812_DMA_STREAM STM32_DMA1_STREAM2 +# define WS2812_DMA_CHANNEL 2 +# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM3_UP +#endif diff --git a/keyboards/keebio/quefrency/rev6/halconf.h b/keyboards/keebio/quefrency/rev6/halconf.h new file mode 100644 index 0000000000..45321a55bc --- /dev/null +++ b/keyboards/keebio/quefrency/rev6/halconf.h @@ -0,0 +1,10 @@ +// Copyright 2024 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SERIAL TRUE + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/keebio/quefrency/rev6/keyboard.json b/keyboards/keebio/quefrency/rev6/keyboard.json new file mode 100644 index 0000000000..84629eb4cf --- /dev/null +++ b/keyboards/keebio/quefrency/rev6/keyboard.json @@ -0,0 +1,633 @@ +{ + "manufacturer": "Keebio", + "keyboard_name": "Quefrency Rev. 6", + "maintainer": "nooges", + "bootloader": "stm32-dfu", + "bootmagic": { + "matrix": [0, 2] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B12", "pin_b": "B13"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B2", "B1", "A5", "B9", "C10", "B6", "C13", "C14", "C15"], + "rows": ["B4", "C11", "A15", "B5", "F1"] + }, + "processor": "STM32G431", + "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, 8], "x": 103, "y": 0, "flags": 4}, + {"x": 97, "y": 4, "flags": 2}, + {"matrix": [0, 7], "x": 91, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 79, "y": 0, "flags": 4}, + {"x": 73, "y": 4, "flags": 2}, + {"matrix": [0, 5], "x": 67, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 54, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 42, "y": 0, "flags": 4}, + {"x": 36, "y": 4, "flags": 2}, + {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4}, + + {"matrix": [1, 2], "x": 33, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 61, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 73, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 85, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 97, "y": 16, "flags": 4}, + + {"matrix": [2, 7], "x": 100, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 88, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 76, "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": 35, "y": 32, "flags": 4}, + + {"matrix": [3, 2], "x": 38, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 58, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 70, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 82, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 94, "y": 48, "flags": 4}, + {"x": 100, "y": 52, "flags": 2}, + {"matrix": [3, 8], "x": 106, "y": 48, "flags": 4}, + + {"x": 107, "y": 64, "flags": 4}, + {"matrix": [4, 7], "x": 97, "y": 64, "flags": 4}, + {"matrix": [4, 6], "x": 85, "y": 64, "flags": 4}, + {"matrix": [4, 5], "x": 75, "y": 64, "flags": 4}, + {"x": 70, "y": 64, "flags": 2}, + {"matrix": [4, 4], "x": 62, "y": 64, "flags": 4}, + {"matrix": [4, 3], "x": 47, "y": 64, "flags": 4}, + {"x": 39, "y": 64, "flags": 2}, + {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, + + {"matrix": [4, 1], "x": 12, "y": 64, "flags": 4}, + {"x": 6, "y": 64, "flags": 2}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 12, "y": 48, "flags": 4}, + {"matrix": [2, 1], "x": 12, "y": 32, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 12, "y": 16, "flags": 4}, + {"matrix": [0, 1], "x": 12, "y": 0, "flags": 4}, + {"x": 6, "y": 4, "flags": 2}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + + {"matrix": [5, 0], "x": 127, "y": 0, "flags": 4}, + {"x": 133, "y": 4, "flags": 2}, + {"matrix": [5, 1], "x": 139, "y": 0, "flags": 4}, + {"matrix": [5, 2], "x": 151, "y": 0, "flags": 4}, + {"matrix": [5, 3], "x": 163, "y": 0, "flags": 4}, + {"x": 170, "y": 4, "flags": 2}, + {"matrix": [5, 4], "x": 176, "y": 0, "flags": 4}, + {"matrix": [5, 5], "x": 188, "y": 0, "flags": 4}, + {"x": 194, "y": 4, "flags": 2}, + {"matrix": [5, 6], "x": 200, "y": 0, "flags": 4}, + {"matrix": [5, 7], "x": 212, "y": 0, "flags": 4}, + {"x": 218, "y": 4, "flags": 2}, + {"matrix": [5, 8], "x": 224, "y": 0, "flags": 4}, + + {"matrix": [6, 8], "x": 224, "y": 16, "flags": 4}, + {"matrix": [6, 7], "x": 209, "y": 16, "flags": 4}, + {"matrix": [6, 6], "x": 194, "y": 16, "flags": 4}, + {"matrix": [6, 5], "x": 182, "y": 16, "flags": 4}, + {"matrix": [6, 4], "x": 170, "y": 16, "flags": 4}, + {"matrix": [6, 3], "x": 157, "y": 16, "flags": 4}, + {"matrix": [6, 2], "x": 145, "y": 16, "flags": 4}, + {"matrix": [6, 1], "x": 133, "y": 16, "flags": 4}, + {"matrix": [6, 0], "x": 121, "y": 16, "flags": 4}, + + {"matrix": [7, 0], "x": 124, "y": 32, "flags": 4}, + {"matrix": [7, 1], "x": 136, "y": 32, "flags": 4}, + {"matrix": [7, 2], "x": 148, "y": 32, "flags": 4}, + {"matrix": [7, 3], "x": 160, "y": 32, "flags": 4}, + {"matrix": [7, 4], "x": 173, "y": 32, "flags": 4}, + {"matrix": [7, 5], "x": 185, "y": 32, "flags": 4}, + {"matrix": [7, 7], "x": 204, "y": 32, "flags": 4}, + {"matrix": [7, 8], "x": 224, "y": 32, "flags": 4}, + + {"matrix": [8, 8], "x": 224, "y": 48, "flags": 4}, + {"matrix": [8, 7], "x": 212, "y": 48, "flags": 4}, + {"matrix": [8, 6], "x": 195, "y": 48, "flags": 4}, + {"matrix": [8, 4], "x": 179, "y": 48, "flags": 4}, + {"matrix": [8, 3], "x": 166, "y": 48, "flags": 4}, + {"matrix": [8, 2], "x": 154, "y": 48, "flags": 4}, + {"matrix": [8, 1], "x": 142, "y": 48, "flags": 4}, + {"x": 138, "y": 52, "flags": 2}, + {"matrix": [8, 0], "x": 130, "y": 48, "flags": 4}, + + {"matrix": [9, 0], "x": 132, "y": 64, "flags": 4}, + {"matrix": [9, 1], "x": 139, "y": 64, "flags": 4}, + {"x": 148, "y": 64, "flags": 4}, + {"x": 154, "y": 64, "flags": 2}, + {"matrix": [9, 2], "x": 163, "y": 64, "flags": 4}, + {"matrix": [9, 3], "x": 176, "y": 64, "flags": 4}, + {"matrix": [9, 4], "x": 188, "y": 64, "flags": 4}, + {"x": 194, "y": 64, "flags": 2}, + {"matrix": [9, 6], "x": 200, "y": 64, "flags": 4}, + {"matrix": [9, 7], "x": 212, "y": 64, "flags": 4}, + {"matrix": [9, 8], "x": 224, "y": 64, "flags": 4}, + {"x": 224, "y": 52, "flags": 2} + ], + "max_brightness": 120, + "sleep": true, + "split_count": [50, 51] + }, + "split": { + "bootmagic": { + "matrix": [5, 8] + }, + "enabled": true, + "encoder": { + "right": { + "rotary": [ + {"pin_a": "B14", "pin_b": "B15"} + ] + } + }, + "matrix_pins": { + "right": { + "cols": ["B2", "B1", "B0", "B12", "B13", "A7", "B6", "C13", "C14"], + "rows": ["A5", "A4", "A3", "B5", "F1"] + } + }, + "transport": { + "sync": { + "matrix_state": true + } + } + }, + "url": "https://keeb.io", + "usb": { + "device_version": "6.0.0", + "pid": "0x6357", + "vid": "0xCB10" + }, + "ws2812": { + "driver": "pwm", + "pin": "B7" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_60" + }, + "layouts": { + "LAYOUT_60": { + "layout": [ + {"matrix": [0, 2], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 5], "x": 3, "y": 0}, + {"matrix": [0, 6], "x": 4, "y": 0}, + {"matrix": [0, 7], "x": 5, "y": 0}, + {"matrix": [0, 8], "x": 6, "y": 0}, + {"matrix": [5, 0], "x": 8, "y": 0}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 5], "x": 13, "y": 0}, + {"matrix": [5, 6], "x": 14, "y": 0}, + {"matrix": [5, 7], "x": 15, "y": 0}, + {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 4], "x": 2.5, "y": 1}, + {"matrix": [1, 5], "x": 3.5, "y": 1}, + {"matrix": [1, 6], "x": 4.5, "y": 1}, + {"matrix": [1, 7], "x": 5.5, "y": 1}, + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1}, + {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5}, + {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 3], "x": 1.75, "y": 2}, + {"matrix": [2, 4], "x": 2.75, "y": 2}, + {"matrix": [2, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 6], "x": 4.75, "y": 2}, + {"matrix": [2, 7], "x": 5.75, "y": 2}, + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25}, + {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 4], "x": 2.25, "y": 3}, + {"matrix": [3, 5], "x": 3.25, "y": 3}, + {"matrix": [3, 6], "x": 4.25, "y": 3}, + {"matrix": [3, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 8], "x": 6.25, "y": 3}, + {"matrix": [8, 0], "x": 8.25, "y": 3}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3}, + {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 15, "y": 3}, + {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 11, "y": 4}, + {"matrix": [9, 3], "x": 12, "y": 4}, + {"matrix": [9, 4], "x": 13, "y": 4}, + {"matrix": [9, 6], "x": 14, "y": 4}, + {"matrix": [9, 7], "x": 15, "y": 4} + ] + }, + "LAYOUT_60_with_macro": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [5, 0], "x": 10.25, "y": 0}, + {"matrix": [5, 1], "x": 11.25, "y": 0}, + {"matrix": [5, 2], "x": 12.25, "y": 0}, + {"matrix": [5, 3], "x": 13.25, "y": 0}, + {"matrix": [5, 4], "x": 14.25, "y": 0}, + {"matrix": [5, 5], "x": 15.25, "y": 0}, + {"matrix": [5, 6], "x": 16.25, "y": 0}, + {"matrix": [5, 7], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, + {"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": 7.75, "y": 1}, + {"matrix": [6, 0], "x": 9.75, "y": 1}, + {"matrix": [6, 1], "x": 10.75, "y": 1}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 4], "x": 13.75, "y": 1}, + {"matrix": [6, 5], "x": 14.75, "y": 1}, + {"matrix": [6, 6], "x": 15.75, "y": 1}, + {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, + {"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": 8, "y": 2}, + {"matrix": [7, 0], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 4], "x": 14, "y": 2}, + {"matrix": [7, 5], "x": 15, "y": 2}, + {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25}, + {"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, 8], "x": 8.5, "y": 3}, + {"matrix": [8, 0], "x": 10.5, "y": 3}, + {"matrix": [8, 1], "x": 11.5, "y": 3}, + {"matrix": [8, 2], "x": 12.5, "y": 3}, + {"matrix": [8, 3], "x": 13.5, "y": 3}, + {"matrix": [8, 4], "x": 14.5, "y": 3}, + {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 17.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25}, + {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 13.25, "y": 4}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 4], "x": 15.25, "y": 4}, + {"matrix": [9, 6], "x": 16.25, "y": 4}, + {"matrix": [9, 7], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_65": { + "layout": [ + {"matrix": [0, 2], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 5], "x": 3, "y": 0}, + {"matrix": [0, 6], "x": 4, "y": 0}, + {"matrix": [0, 7], "x": 5, "y": 0}, + {"matrix": [0, 8], "x": 6, "y": 0}, + {"matrix": [5, 0], "x": 8, "y": 0}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 5], "x": 13, "y": 0}, + {"matrix": [5, 6], "x": 14, "y": 0}, + {"matrix": [5, 7], "x": 15, "y": 0}, + {"matrix": [5, 8], "x": 16, "y": 0}, + {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 4], "x": 2.5, "y": 1}, + {"matrix": [1, 5], "x": 3.5, "y": 1}, + {"matrix": [1, 6], "x": 4.5, "y": 1}, + {"matrix": [1, 7], "x": 5.5, "y": 1}, + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1}, + {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5}, + {"matrix": [6, 8], "x": 16, "y": 1}, + {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 3], "x": 1.75, "y": 2}, + {"matrix": [2, 4], "x": 2.75, "y": 2}, + {"matrix": [2, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 6], "x": 4.75, "y": 2}, + {"matrix": [2, 7], "x": 5.75, "y": 2}, + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25}, + {"matrix": [7, 8], "x": 16, "y": 2}, + {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 4], "x": 2.25, "y": 3}, + {"matrix": [3, 5], "x": 3.25, "y": 3}, + {"matrix": [3, 6], "x": 4.25, "y": 3}, + {"matrix": [3, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 8], "x": 6.25, "y": 3}, + {"matrix": [8, 0], "x": 8.25, "y": 3}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3}, + {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 15, "y": 3}, + {"matrix": [8, 8], "x": 16, "y": 3}, + {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 11, "y": 4}, + {"matrix": [9, 3], "x": 12, "y": 4}, + {"matrix": [9, 4], "x": 13, "y": 4}, + {"matrix": [9, 6], "x": 14, "y": 4}, + {"matrix": [9, 7], "x": 15, "y": 4}, + {"matrix": [9, 8], "x": 16, "y": 4} + ] + }, + "LAYOUT_65_with_macro": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [5, 0], "x": 10.25, "y": 0}, + {"matrix": [5, 1], "x": 11.25, "y": 0}, + {"matrix": [5, 2], "x": 12.25, "y": 0}, + {"matrix": [5, 3], "x": 13.25, "y": 0}, + {"matrix": [5, 4], "x": 14.25, "y": 0}, + {"matrix": [5, 5], "x": 15.25, "y": 0}, + {"matrix": [5, 6], "x": 16.25, "y": 0}, + {"matrix": [5, 7], "x": 17.25, "y": 0}, + {"matrix": [5, 8], "x": 18.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, + {"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": 7.75, "y": 1}, + {"matrix": [6, 0], "x": 9.75, "y": 1}, + {"matrix": [6, 1], "x": 10.75, "y": 1}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 4], "x": 13.75, "y": 1}, + {"matrix": [6, 5], "x": 14.75, "y": 1}, + {"matrix": [6, 6], "x": 15.75, "y": 1}, + {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5}, + {"matrix": [6, 8], "x": 18.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, + {"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": 8, "y": 2}, + {"matrix": [7, 0], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 4], "x": 14, "y": 2}, + {"matrix": [7, 5], "x": 15, "y": 2}, + {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25}, + {"matrix": [7, 8], "x": 18.25, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25}, + {"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, 8], "x": 8.5, "y": 3}, + {"matrix": [8, 0], "x": 10.5, "y": 3}, + {"matrix": [8, 1], "x": 11.5, "y": 3}, + {"matrix": [8, 2], "x": 12.5, "y": 3}, + {"matrix": [8, 3], "x": 13.5, "y": 3}, + {"matrix": [8, 4], "x": 14.5, "y": 3}, + {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 17.25, "y": 3}, + {"matrix": [8, 8], "x": 18.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25}, + {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 13.25, "y": 4}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 4], "x": 15.25, "y": 4}, + {"matrix": [9, 6], "x": 16.25, "y": 4}, + {"matrix": [9, 7], "x": 17.25, "y": 4}, + {"matrix": [9, 8], "x": 18.25, "y": 4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [5, 0], "x": 10.25, "y": 0}, + {"matrix": [5, 1], "x": 11.25, "y": 0}, + {"matrix": [5, 2], "x": 12.25, "y": 0}, + {"matrix": [5, 3], "x": 13.25, "y": 0}, + {"matrix": [5, 4], "x": 14.25, "y": 0}, + {"matrix": [5, 5], "x": 15.25, "y": 0}, + {"matrix": [5, 6], "x": 16.25, "y": 0}, + {"matrix": [5, 7], "x": 17.25, "y": 0}, + {"matrix": [5, 8], "x": 18.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, + {"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": 7.75, "y": 1}, + {"matrix": [6, 0], "x": 9.75, "y": 1}, + {"matrix": [6, 1], "x": 10.75, "y": 1}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 4], "x": 13.75, "y": 1}, + {"matrix": [6, 5], "x": 14.75, "y": 1}, + {"matrix": [6, 6], "x": 15.75, "y": 1}, + {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5}, + {"matrix": [6, 8], "x": 18.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, + {"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": 8, "y": 2}, + {"matrix": [7, 0], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 4], "x": 14, "y": 2}, + {"matrix": [7, 5], "x": 15, "y": 2}, + {"matrix": [7, 6], "x": 16, "y": 2}, + {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25}, + {"matrix": [7, 8], "x": 18.25, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"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, 8], "x": 8.5, "y": 3}, + {"matrix": [8, 0], "x": 10.5, "y": 3}, + {"matrix": [8, 1], "x": 11.5, "y": 3}, + {"matrix": [8, 2], "x": 12.5, "y": 3}, + {"matrix": [8, 3], "x": 13.5, "y": 3}, + {"matrix": [8, 4], "x": 14.5, "y": 3}, + {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 17.25, "y": 3}, + {"matrix": [8, 8], "x": 18.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 13.25, "y": 4}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 4], "x": 15.25, "y": 4}, + {"matrix": [9, 6], "x": 16.25, "y": 4}, + {"matrix": [9, 7], "x": 17.25, "y": 4}, + {"matrix": [9, 8], "x": 18.25, "y": 4} + ] + } + } +} diff --git a/keyboards/keebio/quefrency/rev6/mcuconf.h b/keyboards/keebio/quefrency/rev6/mcuconf.h new file mode 100644 index 0000000000..e1a054267d --- /dev/null +++ b/keyboards/keebio/quefrency/rev6/mcuconf.h @@ -0,0 +1,14 @@ +// Copyright 2024 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +/* enable USART3, used for split comms */ +#undef STM32_SERIAL_USE_USART3 +#define STM32_SERIAL_USE_USART3 TRUE + +/* enable TIM3, used for RGB LED PWM driver */ +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE diff --git a/keyboards/keebio/quefrency/rev6/rev6.c b/keyboards/keebio/quefrency/rev6/rev6.c new file mode 100644 index 0000000000..f7d8b409de --- /dev/null +++ b/keyboards/keebio/quefrency/rev6/rev6.c @@ -0,0 +1,11 @@ +// Copyright 2024 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +void keyboard_pre_init_kb(void) { + // Disable the PD peripheral in pre-init because its pins are being used in the matrix: + PWR->CR3 |= PWR_CR3_UCPD_DBDIS; + // Call the corresponding _user() function (see https://docs.qmk.fm/#/custom_quantum_functions) + keyboard_pre_init_user(); +} diff --git a/keyboards/keebio/quefrency/rev6/rules.mk b/keyboards/keebio/quefrency/rev6/rules.mk new file mode 100644 index 0000000000..c6e2988321 --- /dev/null +++ b/keyboards/keebio/quefrency/rev6/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = usart