Merge remote-tracking branch 'origin/master' into develop

Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/copilot-instructions.md

@@ -1,11 +1,13 @@
 ---
-applyTo: "**"
+applyTo: "keyboards/**"
 excludeAgent:
   - "coding-agent"
 ---
 # GitHub Copilot Instructions for QMK Pull Request Review
 This document provides automated review guidance based on the [QMK PR Checklist](https://docs.qmk.fm/pr_checklist) and it is intended only for use by GitHub Copilot code-review agent during pull request reviews.
 
+> **Scope**: This review applies **only to changes within the `keyboards/` folder**. Changes outside `keyboards/` (e.g., core code, quantum, platforms, drivers) must be flagged and deferred to a QMK Collaborator — do not review them.
+
 ## General PR Requirements
 
 ### Branch and Submission Standards
@@ -41,37 +43,20 @@ This document provides automated review guidance based on the [QMK PR Checklist]
 - **Exception**: Simple assignment-only `rules.mk` files don't need headers
 - **Flag**: Missing or ambiguous license headers (blocks merge)
 
-### QMK Best Practices
-- **Include Guards**: Use `#pragma once` instead of `#ifndef` guards in headers
-- **Abstractions Required**: No low-level GPIO/I2C/SPI functions
-  - Must use QMK abstractions (flag direct hardware access)
-- **Timing Functions**:
-  - Use `wait_ms()` instead of `_delay_ms()`
-  - Remove `#include <util/delay.h>`
-  - Use `timer_read()`, `timer_read32()` from `timer.h`
-- **New Abstractions**: If proposing new abstraction, suggest:
-  1. Prototype in own keyboard first
-  2. Discuss with QMK Collaborators on Discord
-  3. Refactor as separate core change
-  4. Remove the keyboard-specific implementation from board
-
 ---
 
 ## Keymap PR Reviews
 
 **Scope**: These rules apply to files within `keyboards/*/keymaps/*` subdirectories.
 
-### Note on Personal Keymaps
-- **Policy Change**: Personal keymap submissions no longer accepted
-- **Permitted**: Vendor-specific keymaps only
-  - Naming convention: `default_${vendor}` (e.g., `default_clueboard`)
-  - Can be more feature-rich than stock `default` keymaps
+### Note on Non-Default Keymaps
+- Any keymap folder named something other than `default` (e.g., `default_clueboard`, `via`) is a non-default keymap
+- **Do not review the content** of non-default keymaps — flag their presence and note that a QMK Collaborator must review them
 
 ### Keymap Code Standards
 - **Includes**: `#include QMK_KEYBOARD_H` preferred over specific board files
-- **Enums**: Prefer layer enums to `#define`s
+- **Enums**: Suggest using layer enums instead of `#define`s for layers (soft suggestion only)
 - **Custom Keycodes**: First entry must be `QK_USER`
-- **Formatting**: Check spacing alignment on commas and keycodes (spaces, not tabs)
 - **VIA**: Keymaps should NOT enable VIA
   - VIA keymaps belong in [VIA QMK Userspace](https://github.com/the-via/qmk_userspace_via)
 
@@ -96,245 +81,70 @@ This document provides automated review guidance based on the [QMK PR Checklist]
 - **Data Driven Migration**: Must target `develop`
 
 ### info.json and keyboard.json Requirements
-- **Data-Driven Configuration**: Encourage maximum use of `info.json` and `keyboard.json` schema features
-- **Schema Validation**: All `info.json` and `keyboard.json` files must validate against `data/schemas/keyboard.jsonschema`
-  - Use QMK CLI: `qmk lint -kb <keyboard_name>` to validate
-  - Schema defines required fields, data types, and valid values
-  - Check for schema validation errors before submitting PR
+- **Schema Validation**: Verify that `info.json` and `keyboard.json` files are valid JSON (no syntax errors, no trailing commas, properly closed brackets)
 - **Mandatory Elements**:
-  - Valid URL
-  - Valid maintainer
-  - Valid USB VID/PID and device version
-  - Displays correctly in Configurator (Ctrl+Shift+I to preview)
-  - `layout` definitions include matrix positions
-  - Standard layout definitions where applicable
-  - Community Layout macro names when applicable
+  - `url` field is present and begins with `http://` or `https://`
+  - `maintainer` field is present and non-empty
+  - `usb.vid` and `usb.pid` fields are present and match the `0x` hexadecimal format (e.g. `"vid": "0x1234"`, `"pid": "0xFEED"`)
+  - `usb.device_version` field is present
+  - Each key entry in every `layout` array must include a `"matrix"` property (e.g. `{"label": "L01", "matrix": [0, 0], "x": 0, "y": 0}`)
   - Microcontroller and bootloader specified
   - Diode direction (if not using direct pins)
 - **Layout Naming**:
-  - Single layout: Use `LAYOUT` or community layout name
-  - Multiple layouts: Include `LAYOUT_all` + alternate names
-  - Prefer community layout names (e.g., `LAYOUT_tkl_ansi`, `LAYOUT_ortho_4x4`)
-- **Configuration in info.json or keyboard.json** (when applicable):
-  - Direct pin configuration
-  - Backlight, Split keyboard, Encoder, Bootmagic configs
-  - LED Indicator, RGB Light, RGB Matrix configs
-- **Format**: Run `qmk format-json -i` before submitting
-
-### USB VID/PID Uniqueness
-VID+PID combination must be unique across all keyboards. Individual VID or PID values can be reused with different partners.
-**Validation Steps:**
-1. Extract VID and PID from keyboard.json/info.json in the PR
-2. Search for existing usage: `grep -r '"vid".*"0xVVVV"' keyboards/ --include="*.json" | grep -l '"pid".*"0xPPPP"'`
-3. If results found: Check if BOTH VID AND PID match in same file
-   - Both match = **COLLISION** - request different PID
-   - Only one matches = **OK** - different keyboards can share individual values
-4. For keyboard variants/revisions under same keyboard folder:
-   - Different PID recommended for functionally different variants
-   - Same PID acceptable if revisions only differ in hardware routing/pin assignments
-**Quick Reference:**
-- Same PID + Different VID = Valid
-- Same VID + Different PID = Valid
-- Same VID + Same PID = Invalid
-**Review Response:**
-For collision:
-```
-VID+PID collision: 0xVVVV:0xPPPP already used by keyboards/[path]/file.json
-+Please assign a different PID. VID can remain the same.
-```
-For uniqueness confirmed:
-```
-VID+PID validation: 0xVVVV:0xPPPP is unique (no collisions found)
-```
+  - Single layout: Must be named `LAYOUT` or match `LAYOUT_*` pattern
+  - Multiple layouts: Must include `LAYOUT_all` plus at least one alternate name
 
 ### readme.md Requirements
 - **Template**: Must follow [official template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md)
 - **Flash Command**: Present with `:flash` at end
 - **Hardware Link**: Valid availability link (unless handwired)
   - Private groupbuys acceptable
-  - One-off prototypes will be questioned
   - Open-source should link to files
-- **Reset Instructions**: Clear bootloader mode instructions
-- **Images Required**:
-  - Keyboard and PCB photos preferred
-  - Must be hosted externally (imgur, etc.)
-  - Direct image links required (not preview pages)
-  - Example: `https://i.imgur.com/vqgE7Ok.jpg` not `https://imgur.com/vqgE7Ok`
+- **Reset Instructions**: Bootloader reset instructions must be present (non-empty)
+- **Images**: A keyboard image is preferred but not mandatory
+  - If present, images must not be hosted in the repository
+  - If an imgur URL is used, it must link directly to the image (i.e. `https://i.imgur.com/<id>.<ext>`), not the preview page (i.e. not `https://imgur.com/<id>`)
 
 ### rules.mk Standards
 - **Removed Items**:
-  - `MIDI_ENABLE`, `FAUXCLICKY_ENABLE`, `HD44780_ENABLE`
   - Size comments like `(-/+size)`
-  - Alternate bootloader lists if one specified
-  - MCU parameter re-definitions matching defaults in `mcu_selection.mk`
-- **Comment Updates**: Change bootloader comments to generic
-- **Forbidden Features at Keyboard Level** (these belong in keymap-level `rules.mk` only):
-  - `COMBO_ENABLE`
-  - `ENCODER_MAP_ENABLE`
 
 ### config.h Standards (Keyboard Level)
 - **Prohibited**:
   - `#define DESCRIPTION`
-  - Magic Key Options, MIDI Options, HD44780 configuration
-  - User preference `#define`s (belong in keymap)
-  - Re-defining default values (`DEBOUNCE`, RGB settings)
-  - Copy/pasted comment blocks explaining features
+  - Comment blocks explaining features
   - Commented-out unused defines
   - `#include "config_common.h"`
-  - `#define MATRIX_ROWS/COLS` (unless custom matrix)
-- **Minimal Code**: Only critical board boot code required
 - **No Vial**: Vial-related files/changes not accepted
 
 ### Keyboard Implementation Files
 
 #### `<keyboard>.c`
-- **Remove Empty Functions**: Delete empty or commented-out weak-defined functions
-  - `xxxx_xxxx_kb()`, `xxxx_xxxx_user()` implementations
-- **Migration**: `matrix_init_board()` → `keyboard_pre_init_kb()`
-- **Custom Matrix**: Use `lite` variant when possible for standard debounce
-  - `CUSTOM_MATRIX = lite` preferred
-  - Full custom matrix (`yes`) requires justification
-- **LED Indicators**: Prefer Configuration Options over custom `led_update_*()` implementations
-- **Hardware Configuration**: Basic functionality for OLED, encoders, etc. at keyboard level
+- **Advanced Code Flag**: ⚠️ If a `<keyboard>.c` file is present in the PR, flag it as possible advanced code requiring QMK Collaborator review
 
 #### `<keyboard>.h`
 - **Include**: `#include "quantum.h"` at top
-- **Layout Macros**: Move to `info.json` or `keyboard.json` (no longer in header)
+- **Layout Macros**: If `LAYOUT` macros are present, suggest moving them to `info.json` or `keyboard.json`
 
 ### Default Keymap Standards
 
 **Scope**: These rules specifically apply to files within `keyboards/*/keymaps/default/` directories.
 
 - **Pristine Requirement**: Bare minimum clean slate
-  - No custom keycodes
-  - No advanced features (non-exhaustive list of examples: tap dance, macros)
-  - Basic mod taps and home row mods acceptable when necessary
-  - Standard layouts preferred -- see examples in `layouts/default/` and `layouts/community/`
+  - ⚠️ If `keymap.c` contains anything beyond the `keymaps[]` array, or if the `default` keymap folder contains additional `.c` or `.h` files, flag this as possible advanced code requiring QMK Collaborator review
 - **Removed Examples**: Delete `QMKBEST`/`QMKURL` macros
 - **Tri Layer**: Use Tri Layer feature instead of manual `layer_on/off()` + `update_tri_layer()`
 - **Encoder Map**: Use encoder map feature, `encoder_update_user()` may not be present
 - **No VIA**: Default keymap should not enable VIA
-- **Additional Keymaps**: Example/bells-and-whistles keymaps acceptable in same PR (separate from default)
 
 ### Prohibited Files
 - **No VIA JSON**: Belongs in [VIA Keyboard Repo](https://github.com/the-via/keyboards)
 - **No KLE JSON**: Not used within QMK
+- **Single Keyboard Per PR**: A PR must not modify more than one `keyboards/<folder>/` directory
+  - Flag PRs that touch multiple top-level keyboard folders (e.g., both `keyboards/mykeyboard1/` and `keyboards/mykeyboard2/`) — each keyboard must be a separate PR
 - **No Cross-Keyboard Sources**: Don't include files from other keyboard vendors
   - Exception: Core files (e.g., `drivers/sensors/pmw3360.c`)
   - Use of vendor-specific code (e.g., `wilba_tech/wt_main.c`) only when keyboard exists in the same enclosing vendor folder (e.g. a `wilba_tech` keyboard)
-  - Multi-board code is candidate for core refactoring when intended for use by multiple vendors
-
-### Wireless Keyboards
-- **Policy**: Wireless/Bluetooth PRs rejected without complete wireless code
-  - Wireless code may not include anything resembling precompiled data such as `*.a` files or other libraries
-  - Firmware blobs are not permitted in raw form or as compiled C-style arrays either.
-  - GPL2+ license requires full source disclosure
-  - Historically abused for VIA compatibility without releasing sources
-  - PRs without wireless capability will be held indefinitely
-  - Existing merged wireless boards from same vendor held until sources provided
-
-### ChibiOS-Specific Requirements
-- **Board Definitions**: Strong preference for existing ChibiOS board definitions
-  - Use equivalent Nucleo boards when possible
-  - Example: STM32L082KZ can use `BOARD = ST_NUCLEO64_L073RZ`
-  - QMK is eliminating custom board definitions due to maintenance burden
-- **New Board Definitions**:
-  - Must NOT be embedded in keyboard PR
-  - Submit as separate Core PR
-  - `board.c` must have standard `__early_init()` and empty `boardInit()`
-  	- Migrate code intended for `__early_init()` → keyboard-local `early_hardware_init_pre/post()`
-    - Migrate code intended for `boardInit()` → keyboard-local `board_init()`
-
----
-
-## Core PR Reviews
-
-### Targeting and Scope
-- **Branch**: All core PRs must target `develop` branch
-- **Single Focus**: Smallest set of changes per PR
-  - PRs with multiple areas will be asked to split
-  - Keyboard/keymap changes only if affecting base builds or default-like keymaps
-  - Keymap modifications (non-default) should be followup PR after core merge
-  - Large refactoring PRs affecting other keymaps raised separately
-
-### Testing Requirements
-- **New Hardware Support**: Requires test keyboard under `keyboards/handwired/onekey`
-  - New MCUs: Add child keyboard targeting new MCU for build verification
-  - New hardware (displays, matrix, peripherals): Provide associated keymap
-  - Exception: If existing keymap can leverage functionality (consult Collaborators)
-- **Callbacks**: New `_kb`/`_user` callbacks must return `bool` for user override
-- **Unit Tests**: Strongly recommended, may be required
-  - Critical code areas (keycode pipeline) will require tests
-  - Boost confidence in current and future correctness
-
-### Code Quality
-- **Subjective Review**: Other requirements at QMK Collaborators' discretion
-- **Documentation**: Core changes should be well-documented
-
----
-
-## Automated Review Checklist
-
-When reviewing PRs, check the following systematically:
-
-### File Changes Review
-1. **License headers** on all C/H files (GPL2+ preferred, others must be GPL2+ compatible, SPDX format preferred)
-2. **File naming** lowercase (flag exceptions needing justification)
-3. **Include guards** use `#pragma once`
-4. **No low-level hardware access** (GPIO, I2C, SPI direct register writes)
-5. **Timing abstractions** (`wait_ms()`, `timer_read()` usage)
-
-### info.json and keyboard.json Validation
-1. **Schema Compliance**: `keyboard.json` and `info.json` files validate against `data/schemas/keyboard.jsonschema`
-  - Both files are identical syntax, however the `keyboard.json` dictates a buildable target, `info.json` does not
-   - Run `qmk lint -kb <keyboard>` to check schema validation
-   - Check for proper data types (strings, integers, arrays, objects)
-   - Verify required fields are present
-   - Ensure enum values match allowed options in schema
-2. All mandatory fields present and valid
-3. `qmk format-json -i` has been run (formats and validates)
-4. Layout macros moved from headers
-5. Community layout names used where applicable
-
-### rules.mk Cleanup
-1. Deprecated features removed
-2. No size comments
-3. No keymap-only features at keyboard level
-4. No redundant MCU parameter definitions
-
-### config.h Cleanup
-1. No `DESCRIPTION`, `config_common.h`, or prohibited includes
-2. No default value re-definitions
-3. No commented-out defines or feature documentation blocks
-4. No user preference defines at keyboard level
-
-### Keymap Quality
-1. Default keymaps are pristine (no custom keycodes/advanced features)
-2. No `QMKBEST`/`QMKURL` macros
-3. Encoder map feature used instead of `encoder_update_user()`
-4. Tri Layer feature used for multi-layer access
-5. No VIA enabled in default keymap
-
-### Documentation
-1. readme.md follows template
-2. Flash command present with `:flash`
-3. Reset instructions clear
-4. External image hosting (direct links)
-5. Valid hardware availability link
-
-### Code Organization
-1. Empty weak-defined functions removed from `<keyboard>.c`
-2. Proper migration of init functions
-3. No cross-vendor source files
-4. No VIA/KLE JSON files
-
-### Branch and Scope
-1. Not submitted from submitter's own `master` branch (use feature branches)
-2. PR is focused on single change
-3. Targets correct branch:
-   - `master` for new keyboard additions
-   - `develop` for keyboard updates/refactors/moves and core changes
-4. No merge conflicts
 
 ---
 
@@ -352,7 +162,6 @@ See: [Best Practices: Your Fork's Master](https://docs.qmk.fm/newbs_git_using_yo
 ❌ This PR targets the wrong branch:
 - **New keyboard additions** should target `master`
 - **Keyboard updates/refactors/moves** should target `develop`
-- **Core changes** should target `develop`
 
 Please change the target branch accordingly.
 ```
@@ -380,7 +189,7 @@ Exception: Only valid if from upstream sources (LUFA, ChibiOS) or justified by c
 ### For config.h violations:
 ```
 ⚠️ Found prohibited config.h elements:
-- [list specific issues: DESCRIPTION, default value re-definitions, etc.]
+- [list specific issues: `#define DESCRIPTION`, `#include "config_common.h"`, comment blocks, commented-out defines]
 
 Please remove these and refer to [Data Driven Configuration](https://docs.qmk.fm/data_driven_config).
 ```
@@ -393,31 +202,34 @@ Please remove these and refer to [Data Driven Configuration](https://docs.qmk.fm
 - Validate with: \`qmk lint -kb <keyboard_name>\`
 ```
 
-### For schema validation errors:
-```
-❌ Schema validation failed for info.json or keyboard.json:
-- [list specific validation errors from schema]
-- Check `data/schemas/keyboard.jsonschema` for valid field definitions
-- Common issues:
-  - Invalid data types (e.g., string instead of integer)
-  - Missing required fields
-  - Invalid enum values
-  - Incorrectly formatted pin definitions
-```
-
 ### For non-pristine default keymap:
 ```
-⚠️ Default keymap should be pristine (clean slate for users):
-- Remove: [custom keycodes/tap dance/macros/etc.]
-- Keep it minimal with standard layouts where possible
+⚠️ Default keymap requires collaborator review:
+The default `keymap.c` contains code beyond the `keymaps[]` array. The following was detected:
+- [describe: extra functions/definitions in keymap.c, or additional .c/.h files in the default keymap folder]
 
-Consider moving advanced features to a separate example keymap.
+A QMK Collaborator must review this before merging.
+```
+
+### For non-default keymaps:
+```
+⚠️ Non-default keymap detected: `keyboards/[path]/keymaps/[name]/`
+
+This keymap requires a QMK Collaborator to review its content. No automated review of its code was performed.
+```
+
+### For `<keyboard>.c` detected:
+```
+⚠️ `<keyboard>.c` file detected: `keyboards/[path]/[keyboard].c`
+
+This file may contain advanced hardware configuration. A QMK Collaborator must review this before merging.
 ```
 
 ---
 
-## Notes for GitHub Copilot
+## Constraints and Conduct
 
+- **Scope**: Only review changes within the `keyboards/` folder. Flag any changes outside `keyboards/` and defer to a QMK Collaborator without reviewing them.
 - Focus reviews on **objective checklist items** that can be automatically verified
 - Flag **definite violations** with ❌
 - Suggest improvements for **recommendations** with ⚠️
@@ -425,6 +237,7 @@ Consider moving advanced features to a separate example keymap.
 - **Link to relevant QMK documentation** for each issue
 - **Prioritize blocking issues** (license, merge conflicts, branch policy)
 - **Be constructive**: Suggest fixes, not just problems
-- **Acknowledge trade-offs**: Some guidelines have valid exceptions
+- **Do not review non-default keymaps** — flag their presence and defer to a QMK Collaborator
+- **Do not review `<keyboard>.c` content in detail** — flag its presence and defer to a QMK Collaborator
 
 This is meant as a **first-pass review** to catch common issues before human review. Complex architectural decisions, code quality, and subjective assessments still require human QMK Collaborator review.

.github/workflows/api.yml

@@ -25,7 +25,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 1
         persist-credentials: false

.github/workflows/auto_tag.yml

@@ -28,7 +28,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0
 

.github/workflows/bootstrap_testing.yml

@@ -49,14 +49,14 @@ jobs:
           - debian:11
           - debian:12
           - debian:13
-          - ubuntu:20.04
           - ubuntu:22.04
           - ubuntu:24.04
+          - ubuntu:26.04
 
           # RHEL/CentOS/Fedora based
-          - fedora:41
           - fedora:42
           - fedora:43
+          - fedora:44
           - rockylinux:8
           - rockylinux:9
           - rockylinux/rockylinux:10
@@ -64,7 +64,7 @@ jobs:
           - almalinux:9
           - almalinux:10
 
-          # OpenSUSE based (we skip Tumbleweed as it has issues with package versions between pattern installs and other dependencies preinstalled into the base container)
+          # OpenSUSE based (we skip Tumbleweed as it has issues with package mirrors regularly being out of date)
           - opensuse/leap:latest
 
           # Gentoo-based
@@ -96,7 +96,7 @@ jobs:
                   ;;
                 *suse*)
                   zypper --non-interactive refresh
-                  zypper --non-interactive install sudo git shadow findutils  # findutils=xargs
+                  zypper --non-interactive install sudo git shadow findutils tar  # findutils=xargs
                   ;;
                 *gentoo*)
                   emerge-webrsync
@@ -123,7 +123,7 @@ jobs:
           echo 'Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' >> /etc/sudoers
 
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 1
           submodules: recursive
@@ -201,7 +201,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 1
           submodules: recursive
@@ -258,7 +258,7 @@ jobs:
             git:
 
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 1
           submodules: recursive

.github/workflows/ci_build_major_branch.yml

@@ -41,7 +41,7 @@ jobs:
           git config --global --add safe.directory '*'
 
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Install dependencies
         run: pip3 install -r requirements-dev.txt
@@ -89,7 +89,7 @@ jobs:
           git config --global --add safe.directory '*'
 
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 

.github/workflows/ci_build_major_branch_keymap.yml

@@ -32,7 +32,7 @@ jobs:
           git config --global --add safe.directory '*'
 
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Install dependencies
         run: pip3 install -r requirements-dev.txt
@@ -86,7 +86,7 @@ jobs:
           git config --global --add safe.directory '*'
 
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           submodules: recursive
 
@@ -166,7 +166,7 @@ jobs:
 
     steps:
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Download firmwares
         uses: actions/download-artifact@v8

.github/workflows/cli.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         submodules: recursive
 

.github/workflows/develop_update.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0

.github/workflows/docs.yml

@@ -30,7 +30,7 @@ jobs:
     container: ghcr.io/qmk/qmk_cli
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 1
 

.github/workflows/feature_branch_update.yml

@@ -21,7 +21,7 @@ jobs:
         - riot
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0

.github/workflows/format.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0
 

.github/workflows/format_push.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0
 

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0
 

.github/workflows/regen.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt

.github/workflows/regen_push.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt

.github/workflows/unit_test.yml

@@ -27,7 +27,7 @@ jobs:
     container: ghcr.io/qmk/qmk_cli
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         submodules: recursive
 

Makefile

@@ -118,7 +118,7 @@ endef
 TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND)
 
 # As TRY_TO_MATCH_RULE_FROM_LIST_HELPER, but with additional
-# resolution of keyboard_aliases.hjson for provided rule 
+# resolution of keyboard_aliases.hjson for provided rule
 define TRY_TO_MATCH_RULE_FROM_LIST_HELPER_KB
     # Split on ":", padding with empty strings to avoid indexing issues
     TOKEN1:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[0])" $$(RULE))
@@ -300,6 +300,7 @@ endef
 define BUILD_TEST
     TEST_PATH := $1
     TEST_NAME := $$(notdir $$(TEST_PATH))
+    TEST_ID := $$(patsubst ./tests/%,%,$$(TEST_PATH))
     TEST_FULL_NAME := $$(subst /,_,$$(patsubst $$(ROOT_DIR)tests/%,%,$$(TEST_PATH)))
     MAKE_TARGET := $2
     COMMAND := $1
@@ -313,7 +314,7 @@ define BUILD_TEST
         TEST_MSG := $$(MSG_TEST)
         $$(TEST_FULL_NAME)_COMMAND := \
             printf "$$(TEST_MSG)\n"; \
-            $$(TEST_EXECUTABLE); \
+            $$(TEST_EXECUTABLE) --gtest_color=$$(COLOR); \
             if [ $$$$? -gt 0 ]; \
                 then error_occurred=1; \
             fi; \
@@ -451,16 +452,17 @@ distclean_userspace: clean
 endif
 
 # Extra targets for formatting and/or pytest, running within the qmk/qmk_cli container to match GHA.
-CONTAINER_PREAMBLE := export HOME="/tmp"; export PATH="/tmp/.local/bin:\$$PATH"; python3 -m pip install --upgrade pip; python3 -m pip install -r requirements-dev.txt
-
 .PHONY: format-core
 format-core:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk format-c --core-only -a && qmk format-python -a"
+	RUNTIME=docker ./util/docker_cmd.sh qmk format-c --core-only -a
+	RUNTIME=docker ./util/docker_cmd.sh qmk format-python -a
 
 .PHONY: pytest
 pytest:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk pytest"
+	RUNTIME=docker ./util/docker_cmd.sh qmk pytest
 
 .PHONY: format-and-pytest
 format-and-pytest:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk format-c --core-only -a && qmk format-python -a && qmk pytest"
+	RUNTIME=docker ./util/docker_cmd.sh qmk format-c --core-only -a
+	RUNTIME=docker ./util/docker_cmd.sh qmk format-python -a
+	RUNTIME=docker ./util/docker_cmd.sh qmk pytest

builddefs/build_keyboard.mk

@@ -187,9 +187,9 @@ include $(COMMUNITY_RULES_MK)
 
 ifneq ($(COMMUNITY_MODULES),)
 
-$(INTERMEDIATE_OUTPUT)/src/community_config.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
+$(INTERMEDIATE_OUTPUT)/src/community_post_config.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-config-h -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_config.h $(KEYMAP_JSON))
+	$(eval CMD=$(QMK_BIN) generate-community-post-config-h -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_post_config.h $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
 $(INTERMEDIATE_OUTPUT)/src/community_modules.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
@@ -227,10 +227,10 @@ $(INTERMEDIATE_OUTPUT)/src/split_transaction_id_community_modules.inc: $(KEYMAP_
 	$(eval CMD=$(QMK_BIN) generate-split-transaction-id-community-modules-inc -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/split_transaction_id_community_modules.inc $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-COMMUNITY_CONFIG_H = $(INTERMEDIATE_OUTPUT)/src/community_config.h
+COMMUNITY_POST_CONFIG_H = $(INTERMEDIATE_OUTPUT)/src/community_post_config.h
 SRC += $(INTERMEDIATE_OUTPUT)/src/community_modules.c
 
-generated-files: $(INTERMEDIATE_OUTPUT)/src/community_config.h $(INTERMEDIATE_OUTPUT)/src/community_modules.h $(INTERMEDIATE_OUTPUT)/src/community_modules.c $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.c $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h $(INTERMEDIATE_OUTPUT)/src/led_matrix_community_modules.inc $(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc $(INTERMEDIATE_OUTPUT)/src/split_transaction_id_community_modules.inc
+generated-files: $(INTERMEDIATE_OUTPUT)/src/community_post_config.h $(INTERMEDIATE_OUTPUT)/src/community_modules.h $(INTERMEDIATE_OUTPUT)/src/community_modules.c $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.c $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h $(INTERMEDIATE_OUTPUT)/src/led_matrix_community_modules.inc $(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc $(INTERMEDIATE_OUTPUT)/src/split_transaction_id_community_modules.inc
 
 endif
 
@@ -331,10 +331,6 @@ define config_h_community_module_appender
 endef
 $(foreach module,$(COMMUNITY_MODULE_PATHS),$(eval $(call config_h_community_module_appender,$(module))))
 
-ifneq ($(COMMUNITY_CONFIG_H),)
-    CONFIG_H += $(COMMUNITY_CONFIG_H)
-endif
-
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","")
     CONFIG_H += $(KEYBOARD_PATH_5)/config.h
 endif
@@ -376,6 +372,10 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
     POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
 endif
 
+ifneq ($(COMMUNITY_POST_CONFIG_H),)
+    POST_CONFIG_H += $(COMMUNITY_POST_CONFIG_H)
+endif
+
 CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h
 KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c
 

builddefs/common_features.mk

@@ -98,6 +98,7 @@ endif
 
 VALID_STENO_PROTOCOL_TYPES := geminipr txbolt all
 STENO_PROTOCOL ?= all
+
 ifeq ($(strip $(STENO_ENABLE)), yes)
     ifeq ($(filter $(STENO_PROTOCOL),$(VALID_STENO_PROTOCOL_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid STENO_PROTOCOL,STENO_PROTOCOL="$(STENO_PROTOCOL)" is not a valid stenography protocol)
@@ -125,7 +126,7 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
     MOUSE_ENABLE := yes
 endif
 
-VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick azoteq_iqs5xx cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 paw3222 pmw3320 pmw3360 pmw3389 pimoroni_trackball custom
+VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick azoteq_iqs5xx cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 paw3222 pmw3320 pmw3325 pmw3360 pmw3389 pimoroni_trackball custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
@@ -159,6 +160,8 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
             SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), paw3222)
             SPI_DRIVER_REQUIRED = yes
+        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3325)
+            SPI_DRIVER_REQUIRED = yes
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball)
             I2C_DRIVER_REQUIRED = yes
         else ifneq ($(filter $(strip $(POINTING_DEVICE_DRIVER)),pmw3360 pmw3389),)

builddefs/common_rules.mk

@@ -50,10 +50,14 @@ ifeq ($(strip $(DEBUG_ENABLE)),yes)
 	CFLAGS 	 += -ggdb3
 	CXXFLAGS += -ggdb3
 	ASFLAGS  += -ggdb3
-# Create a map file when debugging
-	LDFLAGS  += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
 endif
 
+# Create a map file to see what was compiled and where, unless disabled
+# (e.g. test builds, which use the host linker — Apple's ld does not accept
+# -Map=/--cref).
+ifneq ($(strip $(CREATE_MAP)), no)
+LDFLAGS  += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
+endif
 
 #---------------- C Compiler Options ----------------
 
@@ -66,9 +70,9 @@ CFLAGS += $(CDEFS)
 CFLAGS += -O$(OPT)
 # add color
 ifeq ($(COLOR),true)
-ifeq ("$(shell echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
-	CFLAGS+= -fdiagnostics-color
-endif
+    CFLAGS+= -fdiagnostics-color=always
+else
+    CFLAGS+= -fdiagnostics-color=never
 endif
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes

builddefs/docsgen/package.json

@@ -1,10 +1,8 @@
 {
   "license": "GPL-2.0-or-later",
   "devDependencies": {
-    "vite": "^5.4.21",
-    "vitepress": "^1.1.0",
-    "vitepress-plugin-tabs": "^0.5.0",
-    "vue": "^3.4.24"
+    "vitepress": "^1.6.4",
+    "vitepress-plugin-tabs": "^0.8.0"
   },
   "scripts": {
     "docs:dev": "vitepress dev --host 0.0.0.0",

builddefs/generic_features.mk

@@ -45,6 +45,7 @@ GENERIC_FEATURES = \
     MOUSEKEY \
     MUSIC \
     OS_DETECTION \
+    PLOVER_HID \
     PROGRAMMABLE_BUTTON \
     REPEAT_KEY \
     SECURE \

builddefs/message.mk

@@ -77,13 +77,13 @@ define GENERATE_MSG_MAKE_KB
 endef
 MSG_MAKE_KB = $(eval $(call GENERATE_MSG_MAKE_KB))$(MSG_MAKE_KB_ACTUAL)
 define GENERATE_MSG_MAKE_TEST
-    MSG_MAKE_TEST_ACTUAL := Making test $(BOLD)$(TEST_NAME)$(NO_COLOR)
+    MSG_MAKE_TEST_ACTUAL := Making test $(BOLD)$(TEST_ID)$(NO_COLOR)
     ifneq ($$(MAKE_TARGET),)
         MSG_MAKE_TEST_ACTUAL += with target $(BOLD)$$(MAKE_TARGET)$(NO_COLOR)
     endif
 endef
 MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL)
-MSG_TEST = Testing $(BOLD)$(TEST_NAME)$(NO_COLOR)
+MSG_TEST = Testing $(BOLD)$(TEST_ID)$(NO_COLOR)
 define GENERATE_MSG_AVAILABLE_KEYMAPS
     MSG_AVAILABLE_KEYMAPS_ACTUAL := Available keymaps for $(BOLD)$$(CURRENT_KB)$(NO_COLOR):
 endef

builddefs/show_options.mk

@@ -63,6 +63,7 @@ OTHER_OPTION_NAMES = \
   LCD_BACKLIGHT_ENABLE \
   MACROS_ENABLED \
   PS2_ENABLE \
+  PLOVER_HID_ENABLE \
   PS2_MOUSE_ENABLE \
   PS2_DRIVER \
   RAW_ENABLE \

data/constants/keycodes/keycodes_0.0.9_plover.hjson

@@ -0,0 +1,265 @@
+{
+    "ranges": {
+        "0x5A40/0x003F": {
+            "define": "QK_PLOVER_HID"
+        }
+    },
+    "keycodes": {
+        "0x5A40": {
+            "group": "plover_hid",
+            "key": "PLV_S1"
+        },
+        "0x5A41": {
+            "group": "plover_hid",
+            "key": "PLV_TL"
+        },
+        "0x5A42": {
+            "group": "plover_hid",
+            "key": "PLV_KL"
+        },
+        "0x5A43": {
+            "group": "plover_hid",
+            "key": "PLV_PL"
+        },
+        "0x5A44": {
+            "group": "plover_hid",
+            "key": "PLV_WL"
+        },
+        "0x5A45": {
+            "group": "plover_hid",
+            "key": "PLV_HL"
+        },
+        "0x5A46": {
+            "group": "plover_hid",
+            "key": "PLV_RL"
+        },
+        "0x5A47": {
+            "group": "plover_hid",
+            "key": "PLV_A"
+        },
+        "0x5A48": {
+            "group": "plover_hid",
+            "key": "PLV_O"
+        },
+        "0x5A49": {
+            "group": "plover_hid",
+            "key": "PLV_ST1"
+        },
+        "0x5A4A": {
+            "group": "plover_hid",
+            "key": "PLV_E"
+        },
+        "0x5A4B": {
+            "group": "plover_hid",
+            "key": "PLV_U"
+        },
+        "0x5A4C": {
+            "group": "plover_hid",
+            "key": "PLV_FR"
+        },
+        "0x5A4D": {
+            "group": "plover_hid",
+            "key": "PLV_RR"
+        },
+        "0x5A4E": {
+            "group": "plover_hid",
+            "key": "PLV_PR"
+        },
+        "0x5A4F": {
+            "group": "plover_hid",
+            "key": "PLV_BR"
+        },
+        "0x5A50": {
+            "group": "plover_hid",
+            "key": "PLV_LR"
+        },
+        "0x5A51": {
+            "group": "plover_hid",
+            "key": "PLV_GR"
+        },
+        "0x5A52": {
+            "group": "plover_hid",
+            "key": "PLV_TR"
+        },
+        "0x5A53": {
+            "group": "plover_hid",
+            "key": "PLV_SR"
+        },
+        "0x5A54": {
+            "group": "plover_hid",
+            "key": "PLV_DR"
+        },
+        "0x5A55": {
+            "group": "plover_hid",
+            "key": "PLV_ZR"
+        },
+        "0x5A56": {
+            "group": "plover_hid",
+            "key": "PLV_N1"
+        },
+        "0x5A57": {
+            "group": "plover_hid",
+            "key": "PLV_S2"
+        },
+        "0x5A58": {
+            "group": "plover_hid",
+            "key": "PLV_ST2"
+        },
+        "0x5A59": {
+            "group": "plover_hid",
+            "key": "PLV_ST3"
+        },
+        "0x5A5A": {
+            "group": "plover_hid",
+            "key": "PLV_ST4"
+        },
+        "0x5A5B": {
+            "group": "plover_hid",
+            "key": "PLV_N2"
+        },
+        "0x5A5C": {
+            "group": "plover_hid",
+            "key": "PLV_N3"
+        },
+        "0x5A5D": {
+            "group": "plover_hid",
+            "key": "PLV_N4"
+        },
+        "0x5A5E": {
+            "group": "plover_hid",
+            "key": "PLV_N5"
+        },
+        "0x5A5F": {
+            "group": "plover_hid",
+            "key": "PLV_N6"
+        },
+        "0x5A60": {
+            "group": "plover_hid",
+            "key": "PLV_N7"
+        },
+        "0x5A61": {
+            "group": "plover_hid",
+            "key": "PLV_N8"
+        },
+        "0x5A62": {
+            "group": "plover_hid",
+            "key": "PLV_N9"
+        },
+        "0x5A63": {
+            "group": "plover_hid",
+            "key": "PLV_NA"
+        },
+        "0x5A64": {
+            "group": "plover_hid",
+            "key": "PLV_NB"
+        },
+        "0x5A65": {
+            "group": "plover_hid",
+            "key": "PLV_NC"
+        },
+        "0x5A66": {
+            "group": "plover_hid",
+            "key": "PLV_X1"
+        },
+        "0x5A67": {
+            "group": "plover_hid",
+            "key": "PLV_X2"
+        },
+        "0x5A68": {
+            "group": "plover_hid",
+            "key": "PLV_X3"
+        },
+        "0x5A69": {
+            "group": "plover_hid",
+            "key": "PLV_X4"
+        },
+        "0x5A6A": {
+            "group": "plover_hid",
+            "key": "PLV_X5"
+        },
+        "0x5A6B": {
+            "group": "plover_hid",
+            "key": "PLV_X6"
+        },
+        "0x5A6C": {
+            "group": "plover_hid",
+            "key": "PLV_X7"
+        },
+        "0x5A6D": {
+            "group": "plover_hid",
+            "key": "PLV_X8"
+        },
+        "0x5A6E": {
+            "group": "plover_hid",
+            "key": "PLV_X9"
+        },
+        "0x5A6F": {
+            "group": "plover_hid",
+            "key": "PLV_X10"
+        },
+        "0x5A70": {
+            "group": "plover_hid",
+            "key": "PLV_X11"
+        },
+        "0x5A71": {
+            "group": "plover_hid",
+            "key": "PLV_X12"
+        },
+        "0x5A72": {
+            "group": "plover_hid",
+            "key": "PLV_X13"
+        },
+        "0x5A73": {
+            "group": "plover_hid",
+            "key": "PLV_X14"
+        },
+        "0x5A74": {
+            "group": "plover_hid",
+            "key": "PLV_X15"
+        },
+        "0x5A75": {
+            "group": "plover_hid",
+            "key": "PLV_X16"
+        },
+        "0x5A76": {
+            "group": "plover_hid",
+            "key": "PLV_X17"
+        },
+        "0x5A77": {
+            "group": "plover_hid",
+            "key": "PLV_X18"
+        },
+        "0x5A78": {
+            "group": "plover_hid",
+            "key": "PLV_X19"
+        },
+        "0x5A79": {
+            "group": "plover_hid",
+            "key": "PLV_X20"
+        },
+        "0x5A7A": {
+            "group": "plover_hid",
+            "key": "PLV_X21"
+        },
+        "0x5A7B": {
+            "group": "plover_hid",
+            "key": "PLV_X22"
+        },
+        "0x5A7C": {
+            "group": "plover_hid",
+            "key": "PLV_X23"
+        },
+        "0x5A7D": {
+            "group": "plover_hid",
+            "key": "PLV_X24"
+        },
+        "0x5A7E": {
+            "group": "plover_hid",
+            "key": "PLV_X25"
+        },
+        "0x5A7F": {
+            "group": "plover_hid",
+            "key": "PLV_X26"
+        }
+    }
+}

data/constants/module_hooks/1.1.3.hjson

@@ -0,0 +1,3 @@
+{
+    // This version exists to signify addition of eeconfig support.
+}

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_PIN": {"info_key": "audio.pins.0"},
+    "AUDIO_PIN_ALT": {"info_key": "audio.pins.1"},
     "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"},
@@ -225,6 +227,8 @@
     "RETRO_TAPPING": {"info_key": "tapping.retro", "value_type": "flag"},
     "RETRO_TAPPING_PER_KEY": {"info_key": "tapping.retro_per_key", "value_type": "flag"},
     "SPECULATIVE_HOLD": {"info_key": "tapping.speculative_hold", "value_type": "flag"},
+    "SPECULATIVE_HOLD_FLOW_TERM": {"info_key": "tapping.speculative_hold_flow_term", "value_type": "int"},
+    "SPECULATIVE_HOLD_ONE_KEY": {"info_key": "tapping.speculative_hold_one_key", "value_type": "flag"},
     "TAP_CODE_DELAY": {"info_key": "qmk.tap_keycode_delay", "value_type": "int"},
     "TAP_HOLD_CAPS_DELAY": {"info_key": "qmk.tap_capslock_delay", "value_type": "int"},
     "TAPPING_TERM": {"info_key": "tapping.term", "value_type": "int"},
@@ -269,9 +273,9 @@
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str", "deprecated": true, "replace_with": "`keyboard_name` in info.json"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"},
     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.vid` in info.json"},
-    "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "flag", "deprecated": true, "replace_with": "`host.default.nkro` in info.json"},
 
     // Items we want flagged in lint
+    "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "flag", "invalid": true, "replace_with": "`host.default.nkro` in info.json"},
     "VIAL_KEYBOARD_UID": {"info_key": "_invalid.vial_uid", "invalid": true},
     "VIAL_UNLOCK_COMBO_COLS": {"info_key": "_invalid.vial_unlock_cols", "invalid": true},
     "VIAL_UNLOCK_COMBO_ROWS": {"info_key": "_invalid.vial_unlock_rows", "invalid": true}

data/schemas/keyboard.jsonschema

@@ -46,7 +46,8 @@
         "manufacturer": {"$ref": "./definitions.jsonschema#/text_identifier"},
         "url": {
             "type": "string",
-            "format": "uri"
+            "format": "uri",
+            "minLength": 1
         },
         "development_board": {
             "type": "string",
@@ -992,6 +993,7 @@
             "type": "object",
             "properties": {
                 "chordal_hold": {"type": "boolean"},
+                "flow_tap_term": {"$ref": "./definitions.jsonschema#/unsigned_int"},
                 "force_hold": {"type": "boolean"},
                 "force_hold_per_key": {"type": "boolean"},
                 "ignore_mod_tap_interrupt": {"type": "boolean"},
@@ -1001,6 +1003,9 @@
                 "permissive_hold_per_key": {"type": "boolean"},
                 "retro": {"type": "boolean"},
                 "retro_per_key": {"type": "boolean"},
+                "speculative_hold": {"type": "boolean"},
+                "speculative_hold_flow_term": {"$ref": "./definitions.jsonschema#/unsigned_int"},
+                "speculative_hold_one_key": {"type": "boolean"},
                 "term": {"$ref": "./definitions.jsonschema#/unsigned_int"},
                 "term_per_key": {"type": "boolean"},
                 "toggle": {"$ref": "./definitions.jsonschema#/unsigned_int"}

docs/ChangeLog/20260531.md

@@ -0,0 +1,122 @@
+# QMK Breaking Changes - 2026 May 31 Changelog
+
+## Notable Changes {#notable-changes}
+
+## Deprecation Notices
+
+In line with the [notice period](../support_deprecation_policy#how-much-advance-notice-will-be-given), deprecation notices for larger items are listed here.
+
+### Removal of deprecated isLeftHand ([25897](https://github.com/qmk/qmk_firmware/pull/25897))
+
+Users must migrate to `is_keyboard_left()` found in `split_util.h` instead. For example:
+
+```diff
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+-    return isLeftHand ? OLED_ROTATION_180 : OLED_ROTATION_0;
++    return is_keyboard_left() ? OLED_ROTATION_180 : OLED_ROTATION_0;
+}
+```
+
+### Removal of `usb.force_nkro`/`FORCE_NKRO` ([#25262](https://github.com/qmk/qmk_firmware/pull/25262))
+
+Unpicking the assumption that only USB can do NKRO, forcing of NKRO on every boot has been deprecated. As this setting persists, it produces unnecessary user confusion when the various NKRO keycodes (for example `NK_TOGG`) do not behave as expected.
+
+The new defaults can be configured in the following ways:
+
+:::::tabs
+
+==== keyboard.json
+
+```json [keyboard.json]
+{
+    "host": { // [!code focus]
+        "default": { // [!code focus]
+            "nkro": true // [!code focus]
+        } // [!code focus]
+    } // [!code focus]
+}
+
+```
+
+==== keymap.json
+
+```json [keymap.json]
+{
+    "config": {
+        "host": { // [!code focus]
+            "default": { // [!code focus]
+                "nkro": true // [!code focus]
+            } // [!code focus]
+        } // [!code focus]
+    }
+}
+
+```
+
+==== config.h
+
+```c [config.h]
+#pragma once
+
+#define NKRO_DEFAULT_ON true // [!code focus]
+```
+
+:::::
+
+## Full changelist
+
+Core:
+* Remove deprecated `isLeftHand` ([#25897](https://github.com/qmk/qmk_firmware/pull/25897))
+* Either output Unicode or insert in Leader sequence ([#25940](https://github.com/qmk/qmk_firmware/pull/25940))
+* Add resolution information to digitizer ([#25958](https://github.com/qmk/qmk_firmware/pull/25958))
+* Always generate .map files. ([#25961](https://github.com/qmk/qmk_firmware/pull/25961))
+* Add an `mcu_reset` impl for the kiibohd bootloader. ([#25963](https://github.com/qmk/qmk_firmware/pull/25963))
+* VIA v13 ([#26001](https://github.com/qmk/qmk_firmware/pull/26001))
+* Added PixArt PMW-3325 mouse sensor driver ([#26065](https://github.com/qmk/qmk_firmware/pull/26065))
+* Update WL backing store from 16 to 32-bit for AT32 ([#26066](https://github.com/qmk/qmk_firmware/pull/26066))
+* Refactor Pixel Fractal effect ([#26071](https://github.com/qmk/qmk_firmware/pull/26071))
+* Minor combo code optimisation ([#26073](https://github.com/qmk/qmk_firmware/pull/26073))
+* Options to constrain Speculative Hold: `SPECULATIVE_HOLD_ONE_KEY` and `SPECULATIVE_HOLD_FLOW_TERM`. ([#26099](https://github.com/qmk/qmk_firmware/pull/26099))
+* Add includes for std::setw ([#26153](https://github.com/qmk/qmk_firmware/pull/26153))
+* Bind gtest colour to QMKs 'COLOR' variable ([#26159](https://github.com/qmk/qmk_firmware/pull/26159))
+* Print correct test names ([#26160](https://github.com/qmk/qmk_firmware/pull/26160))
+* Ignore Uninteresting test warnings during test teardown ([#26161](https://github.com/qmk/qmk_firmware/pull/26161))
+* Remove FORCE_NKRO ([#26206](https://github.com/qmk/qmk_firmware/pull/26206))
+
+CLI:
+* Update lint to check all keymaps within the repo ([#25970](https://github.com/qmk/qmk_firmware/pull/25970))
+* Fail when a duplicate module name is detected ([#26238](https://github.com/qmk/qmk_firmware/pull/26238))
+
+Submodule updates:
+* Update ChibiOS, ChibiOS-Contrib. ([#25730](https://github.com/qmk/qmk_firmware/pull/25730))
+* Revert "Update ChibiOS, ChibiOS-Contrib." ([#26074](https://github.com/qmk/qmk_firmware/pull/26074))
+* ChibiOS, ChibiOS-Contrib updates (redux) ([#26079](https://github.com/qmk/qmk_firmware/pull/26079))
+* Bump googletest to v1.16.0 ([#26154](https://github.com/qmk/qmk_firmware/pull/26154))
+
+Keyboards:
+* Require "url" field to not be empty ([#25152](https://github.com/qmk/qmk_firmware/pull/25152))
+* Add nomis/rpi_pico_25x1 macropad ([#25346](https://github.com/qmk/qmk_firmware/pull/25346))
+* Remove override of QK_{LED,RGB}_MATRIX_TOGGLE keycode ([#25672](https://github.com/qmk/qmk_firmware/pull/25672))
+* Add reverse layout to SouthPad v2 ([#25707](https://github.com/qmk/qmk_firmware/pull/25707))
+* Adding Handwired Bouvet Macropad ([#26040](https://github.com/qmk/qmk_firmware/pull/26040))
+* Remove blockader user keymap ([#26075](https://github.com/qmk/qmk_firmware/pull/26075))
+* Remove deprecated audio pin defines ([#26111](https://github.com/qmk/qmk_firmware/pull/26111))
+* Remove `OLED_DISPLAY_128X32` config ([#26190](https://github.com/qmk/qmk_firmware/pull/26190))
+* Migrate SPLIT_OLED_ENABLE ([#26194](https://github.com/qmk/qmk_firmware/pull/26194))
+* Add API version assertion for split_data_sync module ([#26237](https://github.com/qmk/qmk_firmware/pull/26237))
+
+Others:
+* Bump vitepress to 1.6.4 ([#26067](https://github.com/qmk/qmk_firmware/pull/26067))
+* Add usage clarifications to docs/features/unicode.md ([#26156](https://github.com/qmk/qmk_firmware/pull/26156))
+
+Bugs:
+* Fix `USER_PRINT` stripping out `uprintf` ([#25919](https://github.com/qmk/qmk_firmware/pull/25919))
+* Fix possible repeat key infinite recursion ([#25926](https://github.com/qmk/qmk_firmware/pull/25926))
+* Fix `cc-option` on arm-none-eabi-gcc ([#26114](https://github.com/qmk/qmk_firmware/pull/26114))
+* Fix color diagnostics for arm-none-eabi-gcc ([#26115](https://github.com/qmk/qmk_firmware/pull/26115))
+* Mask out active mods when unregistering after retro tapping ([#26127](https://github.com/qmk/qmk_firmware/pull/26127))
+* fix `make test:all` failures seen on macOS Tahoe ([#26136](https://github.com/qmk/qmk_firmware/pull/26136))
+* Add workaround for undefined reference to weak function under mingw ([#26167](https://github.com/qmk/qmk_firmware/pull/26167))
+* fix(ws2812-pwm): allow WS2812_PWM_TICK_FREQUENCY override ([#26186](https://github.com/qmk/qmk_firmware/pull/26186))
+* Clip mouse report values to the logical range from the USB descriptor. ([#26195](https://github.com/qmk/qmk_firmware/pull/26195))
+* Align Mouse USB descriptor ([#26230](https://github.com/qmk/qmk_firmware/pull/26230))

docs/_sidebar.json

@@ -214,7 +214,7 @@
                     { "text": "My Pull Request Was Flagged", "link": "/breaking_changes_instructions" },
                     {
                         "text": "Most Recent ChangeLog",
-                        "link": "/ChangeLog/20260222"
+                        "link": "/ChangeLog/20260531"
                     },
                     { "text": "Past Breaking Changes", "link": "/breaking_changes_history" },
                     { "text": "Deprecation Policy", "link": "/support_deprecation_policy" }

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?
 
+* [2026 May 31](ChangeLog/20260531)
 * [2026 Feb 22](ChangeLog/20260222)
 * [2025 Nov 30](ChangeLog/20251130)
-* [2025 Aug 31](ChangeLog/20250831)
 * [Older Breaking Changes](breaking_changes_history)
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for May 31, 2026.
+The next Breaking Change is scheduled for Aug 30, 2026.
 
 ### Important Dates
 
-* 2025 Feb 22 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2026 May 3 - `develop` closed to new PRs.
-* 2026 May 3 - Call for testers.
-* 2026 May 17 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2026 May 24 - `develop` is locked, only critical bugfix PRs merged.
-* 2026 May 29 - `master` is locked, no PRs merged.
-* 2026 May 31 - Merge `develop` to `master`.
-* 2026 May 31 - `master` is unlocked. PRs can be merged again.
+* 2025 May 31 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2026 Aug 2 - `develop` closed to new PRs.
+* 2026 Aug 2 - Call for testers.
+* 2026 Aug 16 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2026 Aug 23 - `develop` is locked, only critical bugfix PRs merged.
+* 2026 Aug 28 - `master` is locked, no PRs merged.
+* 2026 Aug 30 - Merge `develop` to `master`.
+* 2026 Aug 30 - `master` is unlocked. PRs can be merged again.
 
 ## What changes will be included?
 

docs/breaking_changes_history.md

@@ -2,6 +2,7 @@
 
 This page links to all previous changelogs from the QMK Breaking Changes process.
 
+* [2026 May 31](ChangeLog/20260531) - version 0.33.0
 * [2026 Feb 22](ChangeLog/20260222) - version 0.32.0
 * [2025 Nov 30](ChangeLog/20251130) - version 0.31.0
 * [2025 Aug 31](ChangeLog/20250831) - version 0.30.0

docs/config_options.md

@@ -74,24 +74,6 @@ This is a C header file that is one of the first things included, and will persi
   * pins mapped to rows and columns, from left to right. Defines a matrix where each switch is connected to a separate pin and ground.
 * `#define AUDIO_VOICES`
   * turns on the alternate audio voices (to cycle through)
-* `#define C4_AUDIO`
-  * enables audio on pin C4
-  * Deprecated. Use `#define AUDIO_PIN C4`
-* `#define C5_AUDIO`
-  * enables audio on pin C5
-  * Deprecated. Use `#define AUDIO_PIN C5`
-* `#define C6_AUDIO`
-  * enables audio on pin C6
-  * Deprecated. Use `#define AUDIO_PIN C6`
-* `#define B5_AUDIO`
-  * enables audio on pin B5 (duophony is enabled if one of B pins is enabled along with one of C pins)
-  * Deprecated. Use `#define AUDIO_PIN B5`, or use `#define AUDIO_PIN_ALT B5` if a `C` pin is enabled with `AUDIO_PIN`
-* `#define B6_AUDIO`
-  * enables audio on pin B6 (duophony is enabled if one of B pins is enabled along with one of C pins)
-  * Deprecated. Use `#define AUDIO_PIN B6`, or use `#define AUDIO_PIN_ALT B6` if a `C` pin is enabled with `AUDIO_PIN`
-* `#define B7_AUDIO`
-  * enables audio on pin B7 (duophony is enabled if one of B pins is enabled along with one of C pins)
-  * Deprecated. Use `#define AUDIO_PIN B7`, or use `#define AUDIO_PIN_ALT B7` if a `C` pin is enabled with `AUDIO_PIN`
 * `#define BACKLIGHT_PIN B7`
   * pin of the backlight
 * `#define BACKLIGHT_LEVELS 3`

docs/feature_eeprom.md

@@ -1,14 +1,20 @@
 # Persistent Configuration (EEPROM)
 
-This allows you to configure persistent settings for your keyboard.  These settings are stored in the EEPROM of your controller, and are retained even after power loss. The settings can be read with `eeconfig_read_kb` and `eeconfig_read_user`, and can be written to using `eeconfig_update_kb` and `eeconfig_update_user`. This is useful for features that you want to be able to toggle (like toggling rgb layer indication).  Additionally, you can use `eeconfig_init_kb` and `eeconfig_init_user` to set the default values for the EEPROM.
-
-The complicated part here, is that there are a bunch of ways that you can store and access data via EEPROM, and there is no "correct" way to do this.  However, you only have a DWORD (4 bytes) for each function.
+This allows you to configure persistent settings for your keyboard.  These settings are stored in the EEPROM of your controller, and are retained even after power loss.
 
 Keep in mind that EEPROM has a limited number of writes. While this is very high, it's not the only thing writing to the EEPROM, and if you write too often, you can potentially drastically shorten the life of your MCU.
 
-* If you don't understand the example, then you may want to avoid using this feature, as it is rather complicated.
+::: tip
+If you don't understand the examples, then you may want to avoid using this feature, as it is rather complicated.
+:::
 
-## Example Implementation
+## Basic
+
+The settings can be read with `eeconfig_read_kb` and `eeconfig_read_user`, and can be written to using `eeconfig_update_kb` and `eeconfig_update_user`. This is useful for features that you want to be able to toggle (like toggling rgb layer indication).  Additionally, you can use `eeconfig_init_kb` and `eeconfig_init_user` to set the default values for the EEPROM.
+
+The complicated part here, is that there are a bunch of ways that you can store and access data via EEPROM, and there is no "correct" way to do this.  However, you only have a DWORD (4 bytes) for each function.
+
+### Example Implementation
 
 This is an example of how to add settings, and read and write it. We're using the user keymap for the example here.  This is a complex function, and has a lot going on.  In fact, it uses a lot of the above functions to work!
 
@@ -126,9 +132,111 @@ void eeconfig_init_user(void) {  // EEPROM is getting reset!
 
 And you're done.  The RGB layer indication will only work if you want it to. And it will be saved, even after unplugging the board. And if you use any of the RGB codes, it will disable the layer indication, so that it stays on the mode and color that you set it to.
 
-## 'EECONFIG' Function Documentation
+### Basic API
 
 * Keyboard/Revision: `void eeconfig_init_kb(void)`, `uint32_t eeconfig_read_kb(void)` and `void eeconfig_update_kb(uint32_t val)`
 * Keymap: `void eeconfig_init_user(void)`, `uint32_t eeconfig_read_user(void)` and `void eeconfig_update_user(uint32_t val)`
 
 The `val` is the value of the data that you want to write to EEPROM.  And the `eeconfig_read_*` function return a 32 bit (DWORD) value from the EEPROM.
+
+## Datablock {#datablock}
+
+An extended form exists that allows larger blocks of data to be allocated.
+
+::: info
+When using datablock, the [basic API](#eeconfig-function-documentation) is unavailable.
+:::
+
+:::::tabs
+
+==== keyboard
+
+In `config.h`, define the size required, and optionally a version number:
+
+| Define                       | Default                   | Description                                                      |
+|------------------------------|---------------------------|------------------------------------------------------------------|
+| `EECONFIG_KB_DATA_SIZE`      | `0`                       | Size in bytes for the persistent block of data                   |
+| `EECONFIG_KB_DATA_VERSION`   | `EECONFIG_KB_DATA_SIZE`   | Version number that can be incremented to invalidate stored data |
+
+Which exposes the following API:
+
+```c
+bool     eeconfig_is_kb_datablock_valid(void);
+uint32_t eeconfig_read_kb_datablock(void *data, uint32_t offset, uint32_t length) __attribute__((nonnull));
+uint32_t eeconfig_update_kb_datablock(const void *data, uint32_t offset, uint32_t length) __attribute__((nonnull));
+void     eeconfig_init_kb_datablock(void);
+#    define eeconfig_read_kb_datablock_field(__object, __field) eeconfig_read_kb_datablock(&(__object.__field), offsetof(typeof(__object), __field), sizeof(__object.__field))
+#    define eeconfig_update_kb_datablock_field(__object, __field) eeconfig_update_kb_datablock(&(__object.__field), offsetof(typeof(__object), __field), sizeof(__object.__field))
+```
+
+==== keymap
+
+In `config.h`, define the size required, and optionally a version number:
+
+| Define                       | Default                   | Description                                                      |
+|------------------------------|---------------------------|------------------------------------------------------------------|
+| `EECONFIG_USER_DATA_SIZE`    | `0`                       | Size in bytes for the persistent block of data                   |
+| `EECONFIG_USER_DATA_VERSION` | `EECONFIG_USER_DATA_SIZE` | Version number that can be incremented to invalidate stored data |
+
+Which exposes the following API:
+
+```c
+bool     eeconfig_is_user_datablock_valid(void);
+uint32_t eeconfig_read_user_datablock(void *data, uint32_t offset, uint32_t length) __attribute__((nonnull));
+uint32_t eeconfig_update_user_datablock(const void *data, uint32_t offset, uint32_t length) __attribute__((nonnull));
+void     eeconfig_init_user_datablock(void);
+#    define eeconfig_read_user_datablock_field(__object, __field) eeconfig_read_user_datablock(&(__object.__field), offsetof(typeof(__object), __field), sizeof(__object.__field))
+#    define eeconfig_update_user_datablock_field(__object, __field) eeconfig_update_user_datablock(&(__object.__field), offsetof(typeof(__object), __field), sizeof(__object.__field))
+```
+
+:::::
+
+### Example
+
+This is an example of how to add settings, and read and write it. We're using the user keymap for the example here.
+
+In your `config.h` add:
+
+```c
+#define EECONFIG_USER_DATA_SIZE 8
+```
+
+In your keymap.c file, add:
+
+```c
+#include "debug.h"
+#include "timer.h"
+#include "eeconfig.h"
+
+typedef struct my_config_t {
+    uint64_t data;
+} my_config_t;
+
+static my_config_t config;
+
+void keyboard_post_init_user(void) {
+    if (!eeconfig_is_user_datablock_valid()) {
+        eeconfig_init_user_datablock();
+    }
+
+    eeconfig_read_user_datablock(&config, 0, sizeof(my_config_t));
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!record->event.pressed) {
+        config.data += 1;
+        eeconfig_update_user_datablock(&config, 0, sizeof(my_config_t));
+    }
+
+    return true;
+}
+
+void housekeeping_task_user(void) {
+    static uint32_t last_sync = 0;
+    if (timer_elapsed32(last_sync) > 1000) {
+        last_sync = timer_read32();
+
+        dprintf("Config: %ld\n", config.data);
+    }
+}
+```

docs/feature_layers.md

@@ -51,7 +51,7 @@ Sometimes you need more than one base layer. For example, if you want to switch
 
 ### Advanced Users {#advanced-users}
 
-Once you have a good feel for how layers work and what you can do, you can get more creative. The rules listed in the beginner section will help you be successful by avoiding some of the tricker details but they can be constraining, especially for ultra-compact keyboard users. Understanding how layers work will allow you to use them in more advanced ways.
+Once you have a good feel for how layers work and what you can do, you can get more creative. The rules listed in the beginner section will help you be successful by avoiding some of the trickier details but they can be constraining, especially for ultra-compact keyboard users. Understanding how layers work will allow you to use them in more advanced ways.
 
 Layers stack on top of each other in numerical order. When determining what a keypress does, QMK scans the layers from the top down, stopping when it reaches the first active layer that is not set to `KC_TRNS`. As a result if you activate a layer that is numerically lower than your current layer, and your current layer (or another layer that is active and higher than your target layer) has something other than `KC_TRNS`, that is the key that will be sent, not the key on the layer you just activated. This is the cause of most people's "why doesn't my layer get switched" problem.
 

docs/features/community_modules.md

@@ -135,28 +135,45 @@ This file defines LED matrix effects in the same form as used with `led_matrix_k
 
 This file defines RGB matrix effects in the same form as used with `rgb_matrix_kb.inc` and `rgb_matrix_user.inc` (see [Custom RGB Matrix Effects](rgb_matrix#custom-rgb-matrix-effects)). Effect mode names are prepended with `RGB_MATRIX_COMMUNITY_MODULE_`.
 
-### Custom split keyboard data sync
+### Additional Customization
 
-Defines follow the convention, `SPLIT_TRANSACTION_IDS_MODULE_<MODULE>` (see [Custom data sync](split_keyboard#custom-data-sync)). 
+#### Split Keyboard Data Sync
+
+Defines follow the convention, `SPLIT_TRANSACTION_IDS_MODULE_<MODULE>` (see [Custom data sync](split_keyboard#custom-data-sync)).
+
+#### Persistent Configuration
+
+Defines follow the convention, `EECONFIG_MODULE_<MODULE>_DATA_SIZE` and `EECONFIG_MODULE_<MODULE>_DATA_VERSION` (see [Custom Persistent Configuration](../feature_eeprom#datablock)).
+
+When configured, the following APIs are available:
+
+| API Format                                 | Example (`hello_world` module)                | API Version |
+|--------------------------------------------|-----------------------------------------------|-------------|
+| `eeconfig_is_<module>_datablock_valid`     | `eeconfig_is_hello_world_datablock_valid`     | `1.1.3`     |
+| `eeconfig_read_<module>_datablock`         | `eeconfig_read_hello_world_datablock`         | `1.1.3`     |
+| `eeconfig_update_<module>_datablock`       | `eeconfig_update_hello_world_datablock`       | `1.1.3`     |
+| `eeconfig_init_<module>_datablock`         | `eeconfig_init_hello_world_datablock`         | `1.1.3`     |
+| `eeconfig_read_<module>_datablock_field`   | `eeconfig_read_hello_world_datablock_field`   | `1.1.3`     |
+| `eeconfig_update_<module>_datablock_field` | `eeconfig_update_hello_world_datablock_field` | `1.1.3`     |
 
 ### Compatible APIs
 
 Community Modules may provide specializations for the following APIs:
 
-| Base API                         | API Format                                | Example (`hello_world` module)              | API Version |
-|----------------------------------|-------------------------------------------|---------------------------------------------|-------------|
-| `keyboard_pre_init`              | `keyboard_pre_init_<module>`              | `keyboard_pre_init_hello_world`             | `0.1.0`     |
-| `keyboard_post_init`             | `keyboard_post_init_<module>`             | `keyboard_post_init_hello_world`            | `0.1.0`     |
-| `pre_process_record`             | `pre_process_record_<module>`             | `pre_process_record_hello_world`            | `0.1.0`     |
-| `process_record`                 | `process_record_<module>`                 | `process_record_hello_world`                | `0.1.0`     |
-| `post_process_record`            | `post_process_record_<module>`            | `post_process_record_hello_world`           | `0.1.0`     |
-| `housekeeping_task`              | `housekeeping_task_<module>`              | `housekeeping_task_hello_world`             | `1.0.0`     |
-| `suspend_power_down`             | `suspend_power_down_<module>`             | `suspend_power_down_hello_world`            | `1.0.0`     |
-| `suspend_wakeup_init`            | `suspend_wakeup_init_<module>`            | `suspend_wakeup_init_hello_world`           | `1.0.0`     |
-| `shutdown`                       | `shutdown_<module>`                       | `shutdown_hello_world`                      | `1.0.0`     |
-| `process_detected_host_os`       | `process_detected_host_os_<module>`       | `process_detected_host_os_hello_world`      | `1.0.0`     |
-| `default_layer_state_set`        | `default_layer_state_set_<module>`        | `default_layer_state_set_hello_world`       | `1.1.0`     |
-| `layer_state_set`                | `layer_state_set_<module>`                | `layer_state_set_hello_world`               | `1.1.0`     |
+| Base API                         | API Format                                | Example (`hello_world` module)               | API Version |
+|----------------------------------|-------------------------------------------|----------------------------------------------|-------------|
+| `keyboard_pre_init`              | `keyboard_pre_init_<module>`              | `keyboard_pre_init_hello_world`              | `0.1.0`     |
+| `keyboard_post_init`             | `keyboard_post_init_<module>`             | `keyboard_post_init_hello_world`             | `0.1.0`     |
+| `pre_process_record`             | `pre_process_record_<module>`             | `pre_process_record_hello_world`             | `0.1.0`     |
+| `process_record`                 | `process_record_<module>`                 | `process_record_hello_world`                 | `0.1.0`     |
+| `post_process_record`            | `post_process_record_<module>`            | `post_process_record_hello_world`            | `0.1.0`     |
+| `housekeeping_task`              | `housekeeping_task_<module>`              | `housekeeping_task_hello_world`              | `1.0.0`     |
+| `suspend_power_down`             | `suspend_power_down_<module>`             | `suspend_power_down_hello_world`             | `1.0.0`     |
+| `suspend_wakeup_init`            | `suspend_wakeup_init_<module>`            | `suspend_wakeup_init_hello_world`            | `1.0.0`     |
+| `shutdown`                       | `shutdown_<module>`                       | `shutdown_hello_world`                       | `1.0.0`     |
+| `process_detected_host_os`       | `process_detected_host_os_<module>`       | `process_detected_host_os_hello_world`       | `1.0.0`     |
+| `default_layer_state_set`        | `default_layer_state_set_<module>`        | `default_layer_state_set_hello_world`        | `1.1.0`     |
+| `layer_state_set`                | `layer_state_set_<module>`                | `layer_state_set_hello_world`                | `1.1.0`     |
 | `led_matrix_indicators`          | `led_matrix_indicators_<module>`          | `led_matrix_indicators_hello_world`          | `1.1.0`     |
 | `led_matrix_indicators_advanced` | `led_matrix_indicators_advanced_<module>` | `led_matrix_indicators_advanced_hello_world` | `1.1.0`     |
 | `rgb_matrix_indicators`          | `rgb_matrix_indicators_<module>`          | `rgb_matrix_indicators_hello_world`          | `1.1.0`     |
@@ -164,7 +181,6 @@ Community Modules may provide specializations for the following APIs:
 | `pointing_device_init`           | `pointing_device_init_<module>`           | `pointing_device_init_hello_world`           | `1.1.0`     |
 | `pointing_device_task`           | `pointing_device_task_<module>`           | `pointing_device_task_hello_world`           | `1.1.0`     |
 
-
 ::: info
 An unspecified API is disregarded if a Community Module does not provide a specialization for it.
 :::

docs/features/mouse_keys.md

@@ -77,6 +77,7 @@ Tips:
 * For smoother cursor movements, lower the value of `MOUSEKEY_INTERVAL`. If the refresh rate of your display is 60Hz, you could set it to `16` (1/60). As this raises the cursor speed significantly, you may want to lower `MOUSEKEY_MAX_SPEED`.
 * Setting `MOUSEKEY_TIME_TO_MAX` or `MOUSEKEY_WHEEL_TIME_TO_MAX` to `0` will disable acceleration for the cursor or scrolling respectively. This way you can make one of them constant while keeping the other accelerated, which is not possible in constant speed mode.
 * Setting `MOUSEKEY_WHEEL_INTERVAL` too low will make scrolling too fast. Setting it too high will make scrolling too slow when the wheel key is held down.
+* `MS_ACL0`, `MS_ACL1` and `MS_ACL2` change the cursor and scroll speed to 1/4, 1/2, and the maximum speed, respectively.
 
 Cursor acceleration uses the same algorithm as the X Window System MouseKeysAccel feature. You can read more about it [on Wikipedia](https://en.wikipedia.org/wiki/Mouse_keys).
 

docs/features/pointing_device.md

@@ -320,6 +320,23 @@ The PMW3320 sensor uses a serial type protocol for communication, and requires a
 
 The CPI range is 500-3500, in increments of 250. Defaults to 1000 CPI.
 
+### PMW-3325 Sensor
+
+To use the PMW-3325 sensor, add this to your `rules.mk`:
+
+```make
+POINTING_DEVICE_DRIVER = pmw3325
+```
+
+The following pins must be defined in `config.h`:
+
+| Setting (`config.h`)  | Description                                                        | Default                      |
+| --------------------- | ------------------------------------------------------------------ | ---------------------------- |
+| `PMW3325_CS_PIN`      | (Required) The pin connected to the chip select pin of the sensor. | `POINTING_DEVICE_CS_PIN`     |
+| `PMW3325_SPI_DIVISOR` | (Required) The SPI clock divisor. This is dependent on your MCU.   | _not defined_                |
+
+The CPI range is 100-5000, in increments of 100. Defaults to 2000 CPI.
+
 ### PMW 3360 and PMW 3389 Sensor
 
 This drivers supports both the PMW 3360 and PMW 3389 sensor as well as multiple sensors of the same type _per_ controller, so 2 can be attached at the same side for split keyboards (or unsplit keyboards).

docs/features/ps2_mouse.md

@@ -166,7 +166,7 @@ In your keyboard config.h:
 
 The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using the integrated PIO peripheral and is therefore only available on this MCU.
 
-There are strict requirements for pin ordering but any pair of GPIO pins can be used. The GPIO used for clock must be directly after data, see the included info.json snippet for an example of correct order.
+The GPIOs used for clock and data must be consecutive (in either order).
 
 You may optionally switch the PIO peripheral used with the following define in config.h:
 ```c

docs/features/stenography.md

@@ -6,11 +6,12 @@ The [Open Steno Project](https://www.openstenoproject.org/) has built an open-so
 
 ## Steno Support in QMK
 
-There are three ways that QMK keyboards can support steno, with varying degrees of configuration required:
+There are four ways that QMK keyboards can support steno, with varying degrees of configuration required:
 
 1. Plover with [Arpeggiation](https://plover.wiki/index.php/Glossary#Arpeggiate) requires no changes to any keyboard and is supported by QMK as well as any other QWERTY keyboard.
 2. Plover with [NKRO](https://plover.wiki/index.php/Using_a_standard_keyboard_with_Plover#NKRO). If your keyboard supports NKRO in hardware and you have NKRO enabled as a USB endpoint, you can chord with the keyboard. Many devices will arrive stock like this and will require no changes.
 3. Steno Machine Protocols.  This requires the most configuration, but this has the advantage of allowing you to use your keyboard keys normally (either on another layer or another piece of hardware) without enabling and disabling your steno software.
+4. Plover HID Protocol. This is a custom HID protocol that Plover can understand, but does not require a COM port. It is robust to device disconnects and saves an interface over the COM-based alternatives.
 
 ## Plover with QWERTY Keyboard {#plover-with-qwerty-keyboard}
 
@@ -92,6 +93,22 @@ Examples of steno strokes and the associated packet:
 - `WAZ`     = `10000000 00000010 00100000 00000000 00000000 00000001`
 - `PHAPBGS` = `10000000 00000101 00100000 00000000 01101010 00000000`
 
+## Plover HID Protocol {#plover-hid-protocol}
+
+This mode operates independently of the other Steno "official" machine protocols. Like any other mouse or keyboard, it uses the USB HID protocol to communicate with Plover by sending an 8 byte (64 bit) packet representing a bitfield for all the possible keys on a steno machine plus a number of additional general purpose keys for custom use. This protocol is only understood by Plover as of [5.1.0](https://github.com/opensteno/plover/releases/tag/v5.1.0).
+
+Add
+
+```make
+PLOVER_HID_ENABLE = yes
+```
+
+to your `rules.mk` file. This does **not** require `STENO_ENABLE` to be set.
+
+All of the possible keycodes are defined with the `PLV_` prefix and are available without any additional includes.
+
+More details can be found here: https://github.com/dnaq/plover-machine-hid
+
 ### Switching protocols on the fly {#switching-protocols-on-the-fly}
 
 If you wish to switch the serial protocol used to transfer the steno chords without having to recompile your keyboard firmware every time, you can press the `QK_STENO_BOLT` and `QK_STENO_GEMINI` keycodes in order to switch protocols on the fly.

docs/features/unicode.md

@@ -8,9 +8,9 @@ There are some limitations to this feature. Because there is no "standard" metho
 
 ## Usage {#usage}
 
-The core Unicode API can be used purely programmatically. However, there are also additional subsystems which build on top of it and come with keycodes to make things easier. See below for more details.
+The core Unicode API can be used purely programmatically. However, there are also additional subsystems which build on top of it and come with keycodes to make things easier. See [below](#input-subsystems) for more details.
 
-Add the following to your keymap's `rules.mk`:
+To start, add the following to your keymap's `rules.mk`:
 
 ```make
 UNICODE_COMMON = yes
@@ -18,22 +18,25 @@ UNICODE_COMMON = yes
 
 ## Basic Configuration {#basic-configuration}
 
-Add the following to your `config.h`:
+The following options can be set or overridden in your `config.h`:
 
 |Define                  |Default           |Description                                                                     |
 |------------------------|------------------|--------------------------------------------------------------------------------|
 |`UNICODE_KEY_MAC`       |`KC_LEFT_ALT`     |The key to hold when beginning a Unicode sequence with the macOS input mode     |
 |`UNICODE_KEY_LNX`       |`LCTL(LSFT(KC_U))`|The key to tap when beginning a Unicode sequence with the Linux input mode      |
 |`UNICODE_KEY_WINC`      |`KC_RIGHT_ALT`    |The key to hold when beginning a Unicode sequence with the WinCompose input mode|
-|`UNICODE_SELECTED_MODES`|`-1`              |A comma separated list of input modes for cycling through                       |
+|`UNICODE_SELECTED_MODES`|*n/a*             |A comma separated list of input modes for cycling through                       |
 |`UNICODE_CYCLE_PERSIST` |`true`            |Whether to persist the current Unicode input mode to EEPROM                     |
 |`UNICODE_TYPE_DELAY`    |`10`              |The amount of time to wait, in milliseconds, between Unicode sequence keystrokes|
 
+The default values work well for most use cases, so users usually only need to define `UNICODE_SELECTED_MODES` to set their desired input modes.
+However, if you plan on switching input modes manually (see [keycodes](#keycodes) below) and don't plan on cycling through them, this definition can be omitted.
+
 ### Audio Feedback {#audio-feedback}
 
 If you have the [Audio](audio) feature enabled on your board, you can configure it to play sounds when the input mode is changed.
 
-Add the following to your `config.h`:
+Add one or more of the following definitions to your `config.h`:
 
 |Define             |Default|Description                                                |
 |-------------------|-------|-----------------------------------------------------------|

docs/getting_started_make_guide.md

@@ -91,7 +91,7 @@ Enables your LED to breath while your computer is sleeping. Timer1 is being used
 
 `NKRO_ENABLE`
 
-This allows the keyboard to tell the host OS that up to 248 keys are held down at once (default without NKRO is 6). NKRO is off by default, even if `NKRO_ENABLE` is set. NKRO can be forced by adding `#define FORCE_NKRO` to your config.h or by binding `MAGIC_TOGGLE_NKRO` to a key and then hitting the key.
+This allows the keyboard to tell the host OS that up to 248 keys are held down at once (default without NKRO is 6). NKRO is off by default, even if `NKRO_ENABLE` is set. NKRO can be toggled by binding `NK_TOGG` to a key and then hitting the key.
 
 `BACKLIGHT_ENABLE`
 

docs/newbs_getting_started.md

@@ -75,6 +75,8 @@ curl -fsSL https://install.qmk.fm | sh
 
 ::: info
 Many Linux distributions are supported, but not all. Mainstream distributions will have best success -- if possible, choose either Debian or its derivatives (such as Ubuntu, or Mint), CentOS or its derivatives (such as Fedora, or Rocky Linux), and Arch or its derivatives (such as Manjaro, or CachyOS).
+
+**The standard QMK build environment installed below does not support `musl`-based Linux distributions.**
 :::
 
 Install the QMK CLI by running:

docs/tap_hold.md

@@ -824,7 +824,30 @@ bool get_speculative_hold(uint16_t keycode, keyrecord_t* record) {
 }
 ```
 
-Some operating systems or applications assign actions to tapping a modifier key by itself, e.g., tapping GUI to open a start menu. Because Speculative Hold sends a lone modifier key press in some cases, it can falsely trigger these actions. To prevent this, set `DUMMY_MOD_NEUTRALIZER_KEYCODE` (and optionally `MODS_TO_NEUTRALIZE`) in your `config.h` in the same way as described above for [Retro Tapping](#retro-tapping).
+Some operating systems or applications assign actions to tapping a modifier key by itself, e.g., tapping GUI to open a start menu. Because Speculative Hold sometimes sends a lone modifier key press, it can falsely trigger these actions (known as the "flashing mods" problem). How such an input is handled depends on the OS and application, so unfortunately, there is no universal solution.
+
+To mitigate this issue, you can set `DUMMY_MOD_NEUTRALIZER_KEYCODE` (and optionally `MODS_TO_NEUTRALIZE`) in your `config.h`, as described above for [Retro Tapping](#retro-tapping).
+
+You can further prevent flashing mods by restricting when Speculative Hold is allowed to trigger. There are several options for this:
+
+* Constrain Speculative Hold to one key at a time. Add to your config.h:
+
+  ```c
+  #define SPECULATIVE_HOLD_ONE_KEY
+  ```
+
+  With this option, Speculative Hold does not apply when any mods are already active. Mod combinations across multiple keys can still be made after the mod-tap keys settle.
+
+* Disable Speculative Hold during the flow of fast typing. Add to your config.h:
+
+  ```c
+  #define SPECULATIVE_HOLD_FLOW_TERM 200
+  ```
+
+  This value specifies a duration in milliseconds. Speculative Hold does not apply if a key is pressed within this threshold of the previous key. The effect is similar to [Flow Tap](#flow-tap); however, `SPECULATIVE_HOLD_FLOW_TERM` only restricts when speculation is allowed, without affecting how the key settles.
+
+* Use the Flow Tap option. In the fast flow of typing, the mod-tap key is immediately settled, and therefore no speculation occurs. See [Flow Tap](#flow-tap) for details.
+
 
 ## Why do we include the key record for the per key functions?
 

drivers/ps2/ps2_mouse.c

@@ -101,8 +101,7 @@ 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;
+        // Continue processing anyway to ensure mouse button state is still updated
     }
 #endif
 

drivers/sensors/azoteq_iqs5xx.c

@@ -354,7 +354,7 @@ bool azoteq_iqs5xx_init(void) {
 };
 
 report_mouse_t azoteq_iqs5xx_get_report(report_mouse_t mouse_report) {
-    report_mouse_t temp_report = {0};
+    report_mouse_t temp_report = {.buttons = mouse_report.buttons};
 
     azoteq_iqs5xx_base_data_t base_data       = {0};
     i2c_status_t              status          = azoteq_iqs5xx_get_base_data(&base_data);

drivers/sensors/pmw3325.c

@@ -0,0 +1,173 @@
+// Copyright 2024 Colin Lam (Ploopy Corporation)
+// Copyright 2026 HorrorTroll <https://github.com/HorrorTroll>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "pmw3325.h"
+#include "wait.h"
+#include "gpio.h"
+#include "spi_master.h"
+#include "pointing_device_internal.h"
+
+#define MSB1 0x80
+#define MSB0 0x7F
+
+const pointing_device_driver_t pmw3325_pointing_device_driver = {
+    .init       = pmw3325_init,
+    .get_report = pmw3325_get_report,
+    .set_cpi    = pmw3325_set_cpi,
+    .get_cpi    = pmw3325_get_cpi,
+};
+
+// Convert a 16-bit twos complement binary-represented number into a
+// signed 16-bit integer.
+static int16_t convert_twoscomp_16(uint8_t high, uint8_t low) {
+    uint16_t data = (high << 8) | low;
+
+    if ((data & 0x8000) == 0x8000) {
+        return -32768 + (data & 0x7FFF);
+    } else {
+        return data;
+    }
+}
+
+void pmw3325_write(uint8_t reg_addr, uint8_t data) {
+    spi_start(PMW3325_CS_PIN, false, 3, PMW3325_SPI_DIVISOR);
+    wait_us(1); // tNCS_SCLK
+    spi_write(reg_addr | MSB1);
+    wait_us(180); // tSRAD
+    spi_write(data);
+    wait_us(1); // tSCLK_NCS
+    spi_stop();
+    wait_us(20); // tSRR
+}
+
+uint8_t pmw3325_read(uint8_t reg_addr) {
+    spi_start(PMW3325_CS_PIN, false, 3, PMW3325_SPI_DIVISOR);
+    wait_us(1); // tNCS_SCLK
+    spi_write(reg_addr & MSB0);
+    wait_us(180); // tSRAD
+    uint8_t data = spi_read();
+    wait_us(1); // tSCLK_NCS
+    spi_stop();
+    wait_us(20); // tSRR
+
+    return data;
+}
+
+bool pmw3325_init(void) {
+    wait_ms(50);
+    gpio_set_pin_output(PMW3325_CS_PIN);
+
+    // CS must be kept high at power-up stage for at least 1ms
+    gpio_write_pin_low(PMW3325_CS_PIN);
+    wait_ms(10);
+    gpio_write_pin_high(PMW3325_CS_PIN);
+
+    spi_init();
+
+    // reboot
+    pmw3325_write(0x3A, 0x5A);
+    wait_ms(10);
+
+    pmw3325_write(0x18, 0x39);
+
+    if (!pmw3325_check_signature()) {
+        return false;
+    }
+
+    // read a burst, then discard
+    pmw3325_read(0x02);
+    pmw3325_read(0x03);
+    pmw3325_read(0x04);
+    pmw3325_read(0x05);
+    pmw3325_read(0x06);
+
+    // initialize
+    pmw3325_write(0x78, 0x80);
+    pmw3325_write(0x79, 0x80);
+    pmw3325_write(0x14, 0x80);
+    pmw3325_write(0x20, 0x40);
+    pmw3325_write(0x1A, 0x40);
+    pmw3325_write(0x47, 0x00);
+    pmw3325_write(0x48, 0x01);
+    pmw3325_write(0x60, 0x01);
+    pmw3325_write(0x69, 0x03);
+    pmw3325_write(0x1D, 0x90);
+    pmw3325_write(0x1B, 0x2E);
+    pmw3325_write(0x24, 0x05);
+    pmw3325_write(0x56, 0x00);
+    pmw3325_write(0x2C, 0x8A);
+    pmw3325_write(0x2D, 0x58);
+    pmw3325_write(0x40, 0x80);
+    pmw3325_write(0x7F, 0x01);
+    pmw3325_write(0x7A, 0x32);
+    pmw3325_write(0x6A, 0x93);
+    pmw3325_write(0x6B, 0x68);
+    pmw3325_write(0x6C, 0x71);
+    pmw3325_write(0x6D, 0x50);
+    pmw3325_write(0x7F, 0x00);
+    pmw3325_write(0x7F, 0x02);
+    pmw3325_write(0x29, 0x1C);
+    pmw3325_write(0x2A, 0x1A);
+    pmw3325_write(0x2B, 0x90);
+    pmw3325_write(0x40, 0x80);
+    pmw3325_write(0x7F, 0x00);
+    return true;
+}
+
+report_pmw3325_t pmw3325_read_burst(void) {
+    report_pmw3325_t report = {0};
+
+    uint8_t motion = pmw3325_read(0x02);
+    if ((motion & MSB1) == MSB1) {
+        // Motion detected
+        uint8_t dx_l = pmw3325_read(0x03);
+        uint8_t dx_h = pmw3325_read(0x04);
+        uint8_t dy_l = pmw3325_read(0x05);
+        uint8_t dy_h = pmw3325_read(0x06);
+
+        report.dx = convert_twoscomp_16(dx_h, dx_l);
+        report.dy = convert_twoscomp_16(dy_h, dy_l);
+    }
+
+    return report;
+}
+
+static const uint8_t pmw3325_cpi_lut[50] = {0x02, 0x04, 0x06, 0x08, 0x0B, 0x0D, 0x0F, 0x12, 0x14, 0x16, 0x19, 0x1B, 0x1D, 0x20, 0x22, 0x24, 0x27, 0x29, 0x2B, 0x2E, 0x30, 0x32, 0x34, 0x37, 0x39, 0x3B, 0x3E, 0x40, 0x42, 0x45, 0x47, 0x49, 0x4C, 0x4E, 0x50, 0x53, 0x55, 0x57, 0x5A, 0x5C, 0x5E, 0x61, 0x63, 0x65, 0x68, 0x6A, 0x6C, 0x6F, 0x71, 0x73};
+
+void pmw3325_set_cpi(uint16_t cpi) {
+    uint8_t cpival = CONSTRAIN((cpi / PMW3325_CPI_STEP), (PMW3325_CPI_MIN / PMW3325_CPI_STEP), (PMW3325_CPI_MAX / PMW3325_CPI_STEP)) - 1U;
+
+    pmw3325_write(0x1B, pmw3325_cpi_lut[cpival]);
+}
+
+uint16_t pmw3325_get_cpi(void) {
+    uint8_t cpival = pmw3325_read(0x1B);
+
+    for (uint8_t cpi = 0; cpi < 50; cpi++) {
+        if (pmw3325_cpi_lut[cpi] == cpival) {
+            return (cpi + 1) * PMW3325_CPI_STEP;
+        }
+    }
+
+    return 0;
+}
+
+report_mouse_t pmw3325_get_report(report_mouse_t mouse_report) {
+    report_pmw3325_t data = pmw3325_read_burst();
+
+    if (data.dx != 0 || data.dy != 0) {
+        pd_dprintf("Raw ] X: %d, Y: %d\n", data.dx, data.dy);
+        mouse_report.x = CONSTRAIN_HID_XY(data.dx);
+        mouse_report.y = CONSTRAIN_HID_XY(data.dy);
+    }
+
+    return mouse_report;
+}
+
+bool pmw3325_check_signature(void) {
+    uint8_t checkval_1 = pmw3325_read(0x00);
+    uint8_t checkval_2 = pmw3325_read(0x3F);
+
+    return (checkval_1 == 0x43 && checkval_2 == 0xBC);
+}

drivers/sensors/pmw3325.h

@@ -0,0 +1,44 @@
+// Copyright 2021 Colin Lam (Ploopy Corporation)
+// Copyright 2026 HorrorTroll <https://github.com/HorrorTroll>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "pointing_device.h"
+
+#ifndef PMW3325_CS_PIN
+#    ifdef POINTING_DEVICE_CS_PIN
+#        define PMW3325_CS_PIN POINTING_DEVICE_CS_PIN
+#    else
+#        error "No chip select pin defined -- missing POINTING_DEVICE_CS_PIN or PMW3325_CS_PIN define"
+#    endif
+#endif
+
+#ifndef PMW3325_SPI_DIVISOR
+#    error "No PMW3325 SPI divisor defined -- missing PMW3325_SPI_DIVISOR"
+#endif
+
+typedef struct {
+    int16_t dx;
+    int16_t dy;
+} report_pmw3325_t;
+
+extern const pointing_device_driver_t pmw3325_pointing_device_driver;
+
+bool             pmw3325_init(void);
+report_pmw3325_t pmw3325_read_burst(void);
+void             pmw3325_set_cpi(uint16_t cpi);
+uint16_t         pmw3325_get_cpi(void);
+report_mouse_t   pmw3325_get_report(report_mouse_t mouse_report);
+bool             pmw3325_check_signature(void);
+
+#if !defined(PMW3325_CPI)
+#    define PMW3325_CPI 2000
+#endif
+
+#define PMW3325_CPI_MIN 100
+#define PMW3325_CPI_MAX 5000
+#define PMW3325_CPI_STEP 100
+#define CONSTRAIN(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))

keyboards/1upkeyboards/pi40/config.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define OLED_DISPLAY_128X32
 #define I2C1_SCL_PIN        GP17
 #define I2C1_SDA_PIN        GP16
 #define I2C_DRIVER I2CD0

keyboards/adkb96/rev1/keyboard.json

@@ -14,6 +14,11 @@
         "command": true,
         "nkro": true
     },
+    "host": {
+        "default": {
+            "nkro": true
+        }
+    },
     "qmk": {
         "locking": {
             "enabled": true,

keyboards/akko/5087/5087.c

@@ -140,30 +140,3 @@ void housekeeping_task_kb(void){
     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) {
-    if (!process_record_user(keycode, record)) {
-        return false;
-    }
-    switch (keycode) {
-        case QK_RGB_MATRIX_TOGGLE:
-            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;
-                }
-            }
-            if (!rgb_matrix_is_enabled()) {
-                rgb_matrix_set_flags(LED_FLAG_ALL);
-                rgb_matrix_enable();
-            }
-            return false;
-        default:
-            return true;
-    }
-}

keyboards/alatus/config.h

@@ -0,0 +1,7 @@
+// Copyright 2026 Dominic Yeap-Holliday <DoomishGuy>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Trackpoint
+#define PS2_PIO_USE_PIO1

keyboards/alatus/keyboard.json

@@ -0,0 +1,170 @@
+{
+    "manufacturer": "NA",
+    "keyboard_name": "Alatus",
+    "maintainer": "DoomishGuy",
+    "bootmagic": {
+        "matrix": [0, 4]
+    },
+    "development_board": "promicro_rp2040",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP22", "pin_b": "GP26"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP21", "GP23", "GP20"],
+        "rows": ["GP4", "GP5", "GP6", "GP7"]
+    },
+    "ps2": {
+        "clock_pin": "GP28",
+        "data_pin": "GP27",
+        "driver": "vendor",
+        "enabled": true,
+        "mouse_enabled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"x": 90, "y": 33, "flags": 8},
+            {"x": 90, "y": 49, "flags": 8},
+            {"matrix": [3, 4], "x": 85, "y": 51, "flags": 4},
+            {"matrix": [3, 3], "x": 64, "y": 46, "flags": 4},
+            {"matrix": [3, 2], "x": 44, "y": 43, "flags": 4},
+            {"matrix": [3, 1], "x": 26, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 72, "y": 31, "flags": 4},
+            {"matrix": [2, 3], "x": 54, "y": 29, "flags": 4},
+            {"matrix": [2, 2], "x": 36, "y": 24, "flags": 4},
+            {"matrix": [2, 1], "x": 18, "y": 28, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 36, "flags": 4},
+            {"matrix": [1, 4], "x": 72, "y": 19, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 17, "flags": 4},
+            {"matrix": [1, 2], "x": 36, "y": 12, "flags": 4},
+            {"matrix": [1, 1], "x": 18, "y": 16, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 24, "flags": 4},
+            {"matrix": [0, 4], "x": 72, "y": 7, "flags": 4},
+            {"matrix": [0, 3], "x": 54, "y": 5, "flags": 4},
+            {"matrix": [0, 2], "x": 36, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 18, "y": 4, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 12, "flags": 4},
+            {"x": 0, "y": 9, "flags": 2},
+            {"x": 45, "y": 0, "flags": 2},
+            {"x": 80, "y": 11, "flags": 2},
+            {"x": 75, "y": 48, "flags": 2},
+            {"x": 54, "y": 44, "flags": 2},
+            {"x": 17, "y": 45, "flags": 2},
+            {"x": 134, "y": 33, "flags": 8},
+            {"x": 134, "y": 49, "flags": 8},
+            {"matrix": [7, 4], "x": 139, "y": 51, "flags": 4},
+            {"matrix": [7, 3], "x": 160, "y": 46, "flags": 4},
+            {"matrix": [7, 2], "x": 180, "y": 43, "flags": 4},
+            {"matrix": [7, 1], "x": 198, "y": 43, "flags": 4},
+            {"matrix": [6, 4], "x": 152, "y": 31, "flags": 4},
+            {"matrix": [6, 3], "x": 170, "y": 29, "flags": 4},
+            {"matrix": [6, 2], "x": 188, "y": 24, "flags": 4},
+            {"matrix": [6, 1], "x": 206, "y": 28, "flags": 4},
+            {"matrix": [6, 0], "x": 224, "y": 36, "flags": 4},
+            {"matrix": [5, 4], "x": 152, "y": 19, "flags": 4},
+            {"matrix": [5, 3], "x": 170, "y": 17, "flags": 4},
+            {"matrix": [5, 2], "x": 188, "y": 12, "flags": 4},
+            {"matrix": [5, 1], "x": 206, "y": 16, "flags": 4},
+            {"matrix": [5, 0], "x": 224, "y": 24, "flags": 4},
+            {"matrix": [4, 4], "x": 152, "y": 7, "flags": 4},
+            {"matrix": [4, 3], "x": 170, "y": 5, "flags": 4},
+            {"matrix": [4, 2], "x": 188, "y": 0, "flags": 4},
+            {"matrix": [4, 1], "x": 206, "y": 4, "flags": 4},
+            {"matrix": [4, 0], "x": 224, "y": 12, "flags": 4},
+            {"x": 224, "y": 9, "flags": 2},
+            {"x": 179, "y": 0, "flags": 2},
+            {"x": 144, "y": 11, "flags": 2},
+            {"x": 149, "y": 48, "flags": 2},
+            {"x": 170, "y": 44, "flags": 2},
+            {"x": 207, "y": 45, "flags": 2}
+        ],
+        "max_brightness": 128,
+        "split_count": [27, 27]
+    },
+    "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
+        "enabled": true,
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "GP26", "pin_b": "GP22"}
+                ]
+            }
+        },
+        "handedness": {
+            "pin": "GP29"
+        },
+        "serial": {
+            "driver": "vendor",
+            "pin": "GP1"
+        }
+    },
+    "tags": ["columnar", "split", "encoder", "choc v1", "choc spaced", "RP2040"],
+    "url": "https://codeberg.org/DoomishGuy/alatus",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "L04", "matrix": [0, 0], "x": 0, "y": 1.1},
+                {"label": "L03", "matrix": [0, 1], "x": 1, "y": 0.35},
+                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "L01", "matrix": [0, 3], "x": 3, "y": 0.38},
+                {"label": "L00", "matrix": [0, 4], "x": 4, "y": 0.53},
+                {"label": "R00", "matrix": [4, 4], "x": 10, "y": 0.53},
+                {"label": "R01", "matrix": [4, 3], "x": 11, "y": 0.38},
+                {"label": "R02", "matrix": [4, 2], "x": 12, "y": 0},
+                {"label": "R03", "matrix": [4, 1], "x": 13, "y": 0.35},
+                {"label": "R04", "matrix": [4, 0], "x": 14, "y": 1.1},
+                {"label": "L09", "matrix": [1, 0], "x": 0, "y": 2.1},
+                {"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.35},
+                {"label": "L07", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "L06", "matrix": [1, 3], "x": 3, "y": 1.38},
+                {"label": "L05", "matrix": [1, 4], "x": 4, "y": 1.53},
+                {"label": "R05", "matrix": [5, 4], "x": 10, "y": 1.53},
+                {"label": "R06", "matrix": [5, 3], "x": 11, "y": 1.38},
+                {"label": "R07", "matrix": [5, 2], "x": 12, "y": 1},
+                {"label": "R08", "matrix": [5, 1], "x": 13, "y": 1.35},
+                {"label": "R09", "matrix": [5, 0], "x": 14, "y": 2.1},
+                {"label": "L14", "matrix": [2, 0], "x": 0, "y": 3.1},
+                {"label": "L13", "matrix": [2, 1], "x": 1, "y": 2.35},
+                {"label": "L12", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "L11", "matrix": [2, 3], "x": 3, "y": 2.38},
+                {"label": "L10", "matrix": [2, 4], "x": 4, "y": 2.53},
+                {"label": "R10", "matrix": [6, 4], "x": 10, "y": 2.53},
+                {"label": "R11", "matrix": [6, 3], "x": 11, "y": 2.38},
+                {"label": "R12", "matrix": [6, 2], "x": 12, "y": 2},
+                {"label": "R13", "matrix": [6, 1], "x": 13, "y": 2.35},
+                {"label": "R14", "matrix": [6, 0], "x": 14, "y": 3.1},
+                {"label": "L18", "matrix": [3, 1], "x": 1, "y": 4},
+                {"label": "L17", "matrix": [3, 2], "x": 2, "y": 4},
+                {"label": "L16", "matrix": [3, 3], "x": 3, "y": 4.25},
+                {"label": "L15", "matrix": [3, 4], "x": 4, "y": 4.5},
+                {"label": "R15", "matrix": [7, 4], "x": 10, "y": 4.5},
+                {"label": "R16", "matrix": [7, 3], "x": 11, "y": 4.25},
+                {"label": "R17", "matrix": [7, 2], "x": 12, "y": 4},
+                {"label": "R18", "matrix": [7, 1], "x": 13, "y": 4}
+            ]
+        }
+    }
+}

keyboards/alatus/keymaps/default/keymap.c

@@ -0,0 +1,25 @@
+// Copyright 2026 Dominic Yeap-Holliday <DoomishGuy>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = 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_SLASH,
+              KC_LCTL, KC_LGUI, KC_SPACE, KC_ENTER,    KC_TAB, KC_BSPC, KC_RSFT, KC_RALT
+        )
+};
+// clang-format on
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_QWERTY] = {ENCODER_CCW_CW(KC_L, KC_R), ENCODER_CCW_CW(KC_U, KC_D)},
+};
+#endif

keyboards/alatus/keymaps/default/readme.md

@@ -0,0 +1,4 @@
+# Alatus's Default Keymap
+
+The default keymap is intentionally Spartan, and is not intended for long term use.
+The provided `rules.mk` enables encoder mapping to test encoder functionality.

keyboards/alatus/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/alatus/readme.md

@@ -0,0 +1,26 @@
+# alatus
+
+![alatus](https://i.imgur.com/kVrFpSJ.jpeg)
+
+A low profile 38 key split keyboard featuring rotary encoder and trackpoint support.
+
+* Keyboard Maintainer: [DoomishGuy](https://codeberg.org/DoomishGuy)
+* Hardware Supported: RP2040 Pro Micro and compatible
+* Hardware Availability: [DoomishGuy/alatus](https://codeberg.org/DoomishGuy/alatus)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make alatus:default
+
+Flashing example for this keyboard:
+
+    make alatus: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:
+
+* **Bootmagic reset**: Hold down the top left/right key (for the left/right splits respectively) and plug in the keyboard.
+* **Physical reset button**: Press the reset button below the microcontroller twice in quick succession.

keyboards/aokay/mid1/keyboard.json

@@ -0,0 +1,245 @@
+{
+    "manufacturer": "A.Okay!",
+    "keyboard_name": "MID.1",
+    "maintainer": "sizezero",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D2"},
+            {"pin_a": "D3", "pin_b": "D5"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5"],
+        "rows": ["B4", "D7", "D6", "D4"]
+    },
+    "processor": "atmega32u4",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "animations": {
+            "breathing": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        },
+        "brightness_steps": 8,
+        "default": {
+            "hue": 15,
+            "val": 128
+        },
+        "hue_steps": 5,
+        "led_count": 8,
+        "max_brightness": 200,
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "url": "https://www.aokay.cool/mid-1",
+    "usb": {
+        "device_version": "0.1.0",
+        "pid": "0x414F",
+        "vid": "0x1001"
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "sw1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "sw2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "sw3", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "sw4", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "sw5", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "sw6", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "sw7", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "sw8", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "sw9", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "sw10", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "sw11", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "sw12", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "sw13", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"label": "sw14", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "sw15", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "sw16", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "sw17", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "sw18", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "sw19", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "sw20", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "sw21", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "sw22", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "sw23", "matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+                {"label": "sw24", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "sw25", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "sw26", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "sw27", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "sw28", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "sw29", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "sw30", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "sw31", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "sw32", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "sw33", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "sw34", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+                {"label": "sw35", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "sw36", "matrix": [3, 1], "x": 1.5, "y": 3},
+                {"label": "sw37", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "sw38", "matrix": [3, 3], "x": 3.5, "y": 5, "w": 2.25},
+                {"label": "sw39", "matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.75},
+                {"label": "sw40", "matrix": [3, 5], "x": 2.5, "y": 4, "w": 7},
+                {"label": "sw41", "matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
+                {"label": "sw42", "matrix": [3, 7], "x": 6.75, "y": 5, "w": 2.75},
+                {"label": "sw43", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "sw44", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "sw45", "matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_275u_225u": {
+            "layout": [
+                {"label": "sw1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "sw2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "sw3", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "sw4", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "sw5", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "sw6", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "sw7", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "sw8", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "sw9", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "sw10", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "sw11", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "sw12", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "sw13", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"label": "sw14", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "sw15", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "sw16", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "sw17", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "sw18", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "sw19", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "sw20", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "sw21", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "sw22", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "sw23", "matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+                {"label": "sw24", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "sw25", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "sw26", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "sw27", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "sw28", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "sw29", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "sw30", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "sw31", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "sw32", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "sw33", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "sw34", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+                {"label": "sw35", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "sw36", "matrix": [3, 1], "x": 1.5, "y": 3},
+                {"label": "sw37", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "sw39", "matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.75},
+                {"label": "sw41", "matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
+                {"label": "sw43", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "sw44", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "sw45", "matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_7u": {
+            "layout": [
+                {"label": "sw1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "sw2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "sw3", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "sw4", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "sw5", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "sw6", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "sw7", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "sw8", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "sw9", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "sw10", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "sw11", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "sw12", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "sw13", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"label": "sw14", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "sw15", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "sw16", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "sw17", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "sw18", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "sw19", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "sw20", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "sw21", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "sw22", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "sw23", "matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+                {"label": "sw24", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "sw25", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "sw26", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "sw27", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "sw28", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "sw29", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "sw30", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "sw31", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "sw32", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "sw33", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "sw34", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+                {"label": "sw35", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "sw36", "matrix": [3, 1], "x": 1.5, "y": 3},
+                {"label": "sw40", "matrix": [3, 5], "x": 2.5, "y": 3, "w": 7},
+                {"label": "sw44", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "sw45", "matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_225u_1u_275u": {
+            "layout": [
+                {"label": "sw1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "sw2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "sw3", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "sw4", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "sw5", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "sw6", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "sw7", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "sw8", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "sw9", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "sw10", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "sw11", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "sw12", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "sw13", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"label": "sw14", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "sw15", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "sw16", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "sw17", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "sw18", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "sw19", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "sw20", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "sw21", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "sw22", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "sw23", "matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+                {"label": "sw24", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "sw25", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "sw26", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "sw27", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "sw28", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "sw29", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "sw30", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "sw31", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "sw32", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "sw33", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "sw34", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+                {"label": "sw35", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "sw36", "matrix": [3, 1], "x": 1.5, "y": 3},
+                {"label": "sw37", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "sw38", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25},
+                {"label": "sw40", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "sw42", "matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+                {"label": "sw44", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "sw45", "matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.5}
+            ]
+        }
+    }
+}

keyboards/aokay/mid1/keymaps/default/keymap.json

@@ -0,0 +1,80 @@
+{
+    "config": {
+        "features": {
+            "encoder_map": true
+        }
+    },
+    "encoders": [
+        [
+            {
+                "ccw": "KC_VOLD",
+                "cw": "KC_VOLU"
+            },
+            {
+                "ccw": "KC_PGUP",
+                "cw": "KC_PGDN"
+            }
+        ],
+        [
+            {
+                "ccw": "UG_VALD",
+                "cw": "UG_VALU"
+            },
+            {
+                "ccw": "UG_HUED",
+                "cw": "UG_HUEU"
+            }
+        ],
+        [
+            {
+                "ccw": "UG_PREV",
+                "cw": "UG_NEXT"
+            },
+            {
+                "ccw": "UG_SATD",
+                "cw": "UG_SATU"
+            }
+        ]
+    ],
+    "keyboard": "aokay/mid1",
+    "keymap": "default",
+    "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"
+            "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN"
+            "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH"
+            "KC_LCTL", "KC_LGUI", "KC_LALT"
+            "KC_ENT"
+            "KC_ENT"
+            "MO(1)"
+            "KC_SPC"
+            "KC_SPC"
+            "MO(1)", "MO(2)", "KC_RCTL"
+        ],
+        [
+            "QK_BOOT", "KC_TRNS", "KC_7", "KC_8", "KC_9", "KC_0", "KC_PAST", "KC_HOME", "KC_UP", "KC_END", "KC_TRNS", "KC_DEL"
+            "KC_CAPS", "KC_TRNS", "KC_4", "KC_5", "KC_6", "KC_MINS", "KC_SLSH", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_QUOT"
+            "KC_COMM", "KC_DOT", "KC_1", "KC_2", "KC_3", "KC_EQL", "KC_PPLS", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_TRNS"
+            "UG_TOGG", "KC_TRNS", "KC_TRNS"
+            "KC_0"
+            "KC_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", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
+            "KC_TRNS", "KC_TRNS", "KC_TRNS"
+            "KC_TRNS"
+            "KC_TRNS"
+            "KC_TRNS"
+            "KC_TRNS"
+            "KC_TRNS"
+            "KC_TRNS", "KC_TRNS", "KC_TRNS"
+        ]
+    ]
+}

keyboards/aokay/mid1/readme.md

@@ -0,0 +1,31 @@
+# MID.1
+
+![MID.1 photo](https://i.imgur.com/aPsvygY.jpeg)
+
+## Description
+
+A 40% keyboard with a staggered 4x12 layout and hotswap PCB.
+
+* Keyboard Maintainer: [Sean O'Neill](https://github.com/oneillseanm)
+* Hardware Supported: MID.1
+* Hardware Availability: [MID.1 product page](https://www.aokay.cool/mid-1)
+
+## Setup
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aokay/mid1:default
+
+Flashing example for this keyboard:
+
+    make aokay/mid1: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 three ways:
+
+* **Bootmagic reset**: Hold down `Esc` and plug in the keyboard. `Esc` is assigned to the top left key in the default keymap.
+* **Keycode in layout**: Press `Fn+ESC` for `QK_BOOT`. `Fn` is assigned to the key to the right of the spacebar/split spacebar in the default keymap.
+* **Physical reset button**: Briefly press the button on the back of the PCB, accessible through the bottom case.

keyboards/aokay/readme.md

@@ -0,0 +1,7 @@
+# A.Okay!
+
+This directory contains keyboards designed by **A.Okay!**, a small independent studio focused on thoughtfuly-designed physical products.
+
+Based in Seattle, Washington.
+
+**Website:** https://www.aokay.cool/

keyboards/bear_face/v1/keymaps/default/readme.md

@@ -4,7 +4,6 @@ This layout replaces the stock layout on the Vortex Race 3.
 
 - Caps Lock indicator LED is enabled by default
 - Layer Tap on Caps Lock (tap for Caps Lock, hold for _FN1)
-- FORCE_NKRO enabled by default
 
 - Pn key is set to 'KC_NO' by default
     * Might be a good place for a macro, or to put your PC to sleep, etc.

keyboards/bear_face/v2/keymaps/default/readme.md

@@ -4,7 +4,6 @@ This layout replaces the stock layout on the Vortex Race 3.
 
 - Caps Lock indicator LED is enabled by default
 - Layer Tap on Caps Lock (tap for Caps Lock, hold for _FN1)
-- FORCE_NKRO enabled by default
 
 - Pn key is set to 'KC_NO' by default
     * Might be a good place for a macro, or to put your PC to sleep, etc.

keyboards/bear_face/v2/keymaps/default_iso/readme.md

@@ -4,7 +4,6 @@ This layout replaces the stock layout on the Vortex Race 3.
 
 - Caps Lock indicator LED is enabled by default
 - Layer Tap on Caps Lock (tap for Caps Lock, hold for _FN1)
-- FORCE_NKRO enabled by default
 
 - Pn key is set to 'KC_NO' by default
     * Might be a good place for a macro, or to put your PC to sleep, etc.

keyboards/bear_face/v3/keymaps/default/readme.md

@@ -4,7 +4,6 @@ This layout replaces the stock layout on the Vortex Race 3.
 
 - Caps Lock indicator LED is enabled by default
 - Layer Tap on Caps Lock (tap for Caps Lock, hold for _FN1)
-- FORCE_NKRO enabled by default
 
 - Pn key is set to 'KC_NO' by default
     * Might be a good place for a macro, or to put your PC to sleep, etc.

keyboards/bear_face/v3/keymaps/default_iso/readme.md

@@ -4,7 +4,6 @@ This layout replaces the stock layout on the Vortex Race 3.
 
 - Caps Lock indicator LED is enabled by default
 - Layer Tap on Caps Lock (tap for Caps Lock, hold for _FN1)
-- FORCE_NKRO enabled by default
 
 - Pn key is set to 'KC_NO' by default
     * Might be a good place for a macro, or to put your PC to sleep, etc.

keyboards/bluebell/swoop/config.h

@@ -19,6 +19,5 @@
 
 // OLED driver
 #ifdef OLED_DRIVER_ENABLE
-  #define OLED_DISPLAY_128X32
   #define OLED_TIMEOUT 30000
 #endif

keyboards/buzzard/rev1/config.h

@@ -3,10 +3,6 @@
 
 #pragma once
 
-#ifdef OLED_ENABLE
-#define OLED_DISPLAY_128X32
-#endif
-
 #ifdef PS2_DRIVER_INTERRUPT
 #define PS2_CLOCK_PIN   E6
 #define PS2_DATA_PIN    D7

keyboards/candykeys/candy87/candy87.c

@@ -0,0 +1,34 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        rgb_matrix_set_color(0, 0, 255, 0);
+    } else {
+        rgb_matrix_set_color(0, 0, 0, 0);
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(1, 0, 255, 0);
+    } else {
+        rgb_matrix_set_color(1, 0, 0, 0);
+    }
+    return false;
+}

keyboards/candykeys/candy87/keymaps/default/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#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_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_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_APP,       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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                             KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/keymaps/f12_ansi/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_ansi_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,   MO(1),            		                    KC_UP,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                                  KC_SPC,                                      KC_APP,       KC_RALT,  KC_RGUI,   KC_RCTL,                     KC_LEFT,       KC_DOWN,           KC_RGHT),
+
+[1] = LAYOUT_tkl_ansi_split_bs_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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,            KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                             KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/keymaps/f12_ansi_tsangan/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_ansi_tsangan_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,   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_tkl_ansi_tsangan_split_bs_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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,            KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                                        KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/keymaps/f12_iso/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_iso_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_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_BSLS,  
+  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_APP,       KC_RALT,  KC_RGUI,   KC_RCTL,                     KC_LEFT,       KC_DOWN,           KC_RGHT),
+
+[1] = LAYOUT_tkl_iso_split_bs_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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                             KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/keymaps/f12_iso_tsangan/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_iso_tsangan_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_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_BSLS,  
+  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_RGHT),
+
+[1] = LAYOUT_tkl_iso_tsangan_split_bs_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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                                        KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/keymaps/f13_ansi/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_f13_ansi_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,   MO(1),            		                    KC_UP,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                                  KC_SPC,                                      KC_APP,       KC_RALT,  KC_RGUI,   KC_RCTL,                     KC_LEFT,       KC_DOWN,           KC_RGHT),
+
+[1] = LAYOUT_tkl_f13_ansi_split_bs_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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,            KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                             KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/keymaps/f13_ansi_tsangan/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_f13_ansi_tsangan_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,   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_tkl_f13_ansi_tsangan_split_bs_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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,            KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                                        KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/keymaps/f13_iso/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_f13_iso_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_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_BSLS,  
+  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_APP,       KC_RALT,  KC_RGUI,   KC_RCTL,                     KC_LEFT,       KC_DOWN,           KC_RGHT),
+
+[1] = LAYOUT_tkl_f13_iso_split_bs_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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                             KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/keymaps/f13_iso_tsangan/keymap.c

@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_f13_iso_tsangan_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_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_BSLS,  
+  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_RGHT),
+
+[1] = LAYOUT_tkl_f13_iso_tsangan_split_bs_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,    RM_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,     RM_HUEU,    RM_SATU,    RM_VALU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       		 RM_HUED,    RM_SATD,    RM_VALD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,       KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,            		         RM_SPDU,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,                                                                        KC_TRNS, KC_TRNS, KC_TRNS,              RM_PREV,    RM_SPDD,    RM_NEXT)
+};

keyboards/candykeys/candy87/readme.md

@@ -0,0 +1,29 @@
+# Candy87
+
+![Candy87](https://i.imgur.com/HeCz1u8.png)
+
+The Candy87 Hotswap PCB is a universal TKL PCB by Candykeys.
+It supports ISO Hotswap by default (ANSI possible with desolering two hotswap sockets) and many layout options. 
+It was mainly made for the F1-8X V2, but fits similar keyboards as well.
+
+* Keyboard Maintainer: [RarePotato8DE](https://github.com/rarepotato8de)
+* Hardware Supported: Candy87 PCB for F1-8X V2 and similar
+* Hardware Availability: [Buy on Candykeys](https://candykeys.com/product/candy87-hotswap-pcb-iso)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make candykeys/candy87:default
+
+Flashing example for this keyboard:
+
+    make candykeys/candy87: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**: Hold down the "BOOT" button on the back and double press "RESET". Release "BOOT" after
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/cannonkeys/minimi40/ortho/keyboard.json

@@ -0,0 +1,180 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Minimi40 Ortho",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A4", "C14", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["A5", "A7", "A3", "B7"]
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0037",
+        "vid": "0xCA04"
+    },
+    "community_layouts": ["ortho_4x12"],
+    "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_2x2bar": {
+            "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, 5], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 7], "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_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}
+            ]
+        }
+    }
+}

keyboards/cannonkeys/minimi40/ortho/keymaps/default/keymap.c

@@ -0,0 +1,66 @@
+// Copyright 2024 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+
+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 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_BASE] = 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_GRV,  KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER),   KC_SPC,  KC_SPC,  MO(_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 | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | 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_HOME, KC_END,  _______,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______,    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 / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | 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_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+};
+

keyboards/cannonkeys/minimi40/ortho/readme.md

@@ -0,0 +1,21 @@
+# Minimi40 Ortho
+
+* Hardware Supported: STM32F072CBT6/APM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/minimi40/ortho:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/minimi40/ortho: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**: Toggle the switch on the back of the pcb to "1" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/cannonkeys/minimi40/ortho/rules.mk

@@ -0,0 +1,3 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+

keyboards/cannonkeys/minimi40/readme.md

@@ -0,0 +1,11 @@
+# Minimi40
+
+This has both the ortho and staggered versions of the wired Minimi40 PCBs
+The hotswap and solderable versions use the same firmware.
+
+This firmware can also be used on the GEON F1-40
+
+Please check each folder's README for more details.
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)  
+* Hardware Availability: [CannonKeys](https://cannonkeys.com) 

keyboards/cannonkeys/minimi40/staggered/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

keyboards/cannonkeys/minimi40/staggered/keyboard.json

@@ -0,0 +1,116 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Minimi40 Staggered",
+    "maintainer": "awkannan",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP8", "GP10", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0"],
+        "rows": ["GP17", "GP27", "GP11", "GP12"]
+    },
+    "processor": "RP2040",
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0036",
+        "vid": "0xCA04"
+    },
+    "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": [3, 7], "x": 10, "y": 0},
+                {"matrix": [0, 10], "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, 10], "x": 10.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, 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.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, "w": 1.25},
+                {"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, "w": 1.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        },
+        "LAYOUT_full_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": [3, 7], "x": 10, "y": 0},
+                {"matrix": [0, 10], "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, 10], "x": 10.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, 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.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3, "w": 6.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}

keyboards/cannonkeys/minimi40/staggered/keymaps/default/keymap.c

@@ -0,0 +1,25 @@
+// 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(
+    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_COMM, KC_RSFT, MO(2),
+    KC_LCTL, KC_LGUI, KC_LALT,          LT(1, KC_SPC),  KC_SPC,                    KC_RALT, MO(1), KC_RCTL
+),
+[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_DEL,
+    _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______,
+    _______, _______, _______, _______, _______, KC_SLSH, KC_SCLN, KC_QUOT, KC_DOT,  KC_UP, _______,
+    _______, _______, _______,          _______, _______,                   KC_LEFT, KC_DOWN, KC_RIGHT
+),
+[2] = LAYOUT_all(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, _______, _______, KC_DEL,
+    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8, _______, _______,  _______, _______, _______, _______,
+    KC_CAPS, KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, _______, _______,  _______, _______,
+    _______, _______, _______,          _______, _______,                   KC_PGUP, _______, KC_PGDN
+)
+};

keyboards/cannonkeys/minimi40/staggered/readme.md

@@ -0,0 +1,21 @@
+# Minimi40 Staggered
+
+* Hardware Supported: RP2040 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/minimi40/staggered:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/minimi40/staggered: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**: Hold the "BOOTMODE" button on the back of the PCB and briefly press the "RESET" button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/chosfox/cf81/cf81.c

@@ -157,32 +157,3 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
 }
 
 #endif
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_user(keycode, record)) {
-        return false;
-    }
-    switch (keycode) {
-#ifdef RGB_MATRIX_ENABLE
-        case QK_RGB_MATRIX_TOGGLE:
-            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;
-                }
-            }
-            if (!rgb_matrix_is_enabled()) {
-                rgb_matrix_set_flags(LED_FLAG_ALL);
-                rgb_matrix_enable();
-            }
-            return false;
-#endif
-        default:
-            return true;
-    }
-}

keyboards/delikeeb/vanana/rev1/config.h

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define B7_AUDIO
+#define AUDIO_PIN B7
 
 /* 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).

keyboards/delikeeb/vanana/rev2/config.h

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define B7_AUDIO
+#define AUDIO_PIN B7
 
 /* 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).

keyboards/dj505/picolx/keyboard.json

@@ -0,0 +1,115 @@
+{
+    "manufacturer": "dj505",
+    "keyboard_name": "PicoLX",
+    "maintainer": "jjc1138",
+    "bootloader": "rp2040",
+    "bootloader_instructions": "Hold down the BOOTSEL button on the underside of the PCB when connecting the USB cable",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP24", null, "GP22", "GP4", null, "GP0"],
+            [null, "GP23", null, null, "GP3", null],
+            ["GP19", null, "GP18", "GP2", null, "GP1"],
+            ["GP12", "GP13", null, null, null, null]
+        ]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "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_splash": true,
+            "splash": true
+        },
+        "default": {
+            "animation": "gradient_up_down",
+            "hue": 176,
+            "speed": 254,
+            "val": 64
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"x": 112, "y": 0, "flags": 2},
+            {"x": 0, "y": 0, "flags": 2},
+            {"x": 0, "y": 64, "flags": 2},
+            {"x": 112, "y": 64, "flags": 2},
+            {"x": 224, "y": 64, "flags": 2},
+            {"x": 224, "y": 0, "flags": 2},
+            {"matrix": [0, 5], "x": 212, "y": 18, "flags": 4},
+            {"matrix": [2, 5], "x": 212, "y": 57, "flags": 4},
+            {"matrix": [1, 4], "x": 174, "y": 37, "flags": 4},
+            {"matrix": [2, 3], "x": 136, "y": 57, "flags": 4},
+            {"matrix": [0, 3], "x": 136, "y": 18, "flags": 4},
+            {"matrix": [0, 2], "x": 88, "y": 18, "flags": 4},
+            {"matrix": [2, 2], "x": 88, "y": 57, "flags": 4},
+            {"matrix": [1, 1], "x": 50, "y": 37, "flags": 4},
+            {"matrix": [2, 0], "x": 12, "y": 57, "flags": 4},
+            {"matrix": [0, 0], "x": 12, "y": 18, "flags": 4},
+            {"x": 131, "y": 32, "flags": 2},
+            {"x": 112, "y": 32, "flags": 2},
+            {"x": 94, "y": 32, "flags": 2}
+        ],
+        "sleep": true
+    },
+    "url": "https://github.com/dj505/PicoLX",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4C58",
+        "vid": "0xFEED"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP21"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "P1 UL", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "P1 UR", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "P2 UL", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "P2 UR", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "P1 CN", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "P2 CN", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "P1 DL", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "P1 DR", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "P2 DL", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "P2 DR", "matrix": [2, 5], "x": 5, "y": 2},
+                {"label": "Service", "matrix": [3, 0], "x": 6.5, "y": 0.5},
+                {"label": "Test", "matrix": [3, 1], "x": 6.5, "y": 1.5}
+            ]
+        }
+    }
+}

keyboards/dj505/picolx/keymaps/allinone/keymap.json

@@ -0,0 +1,26 @@
+{
+    "keyboard": "dj505/picolx",
+    "keymap": "allinone",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+            "KC_Q",               "KC_E",    "KC_TAB",             "KC_UP",
+
+                       "KC_X",                          "KC_G",
+
+            "KC_A",               "KC_D",    "KC_SPC",             "KC_DOWN",
+
+            "LT(1,KC_ESC)", "KC_ENT"
+        ],
+
+        [
+            "KC_F1",              "KC_F2",   "KC_F5",              "KC_F6",
+
+                       "KC_TRNS",                       "KC_TRNS",
+
+            "KC_F3",              "KC_F4",   "KC_F7",              "KC_F8",
+
+            "KC_TRNS", "QK_BOOT"
+        ]
+    ]
+}

keyboards/dj505/picolx/keymaps/allinone/readme.md

@@ -0,0 +1,21 @@
+# PicoLX All-in-one Keymap
+
+The 'allinone' keymap puts most of the buttons that you need for navigating the Pump It Up Rise menus in the main mode. If you configure the game to use those buttons for gameplay as well, then you can play the game and navigate most of the menus without having to switch modes.
+
+```
+  Q           E        Tab         Up
+        X                     G
+  A           D       Space       Down
+
+ Service: Esc when tapped, or temporarily activates the mode below when held
+ Test: Enter
+```
+
+When Service is held the buttons have these meanings instead:
+```
+  F1         F2         F5         F6
+        -                     -
+  F3         F4         F7         F8
+
+ Test: Bootloader mode
+```

keyboards/dj505/picolx/keymaps/default/keymap.json

@@ -0,0 +1,16 @@
+{
+    "keyboard": "dj505/picolx",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+            "KC_Q",               "KC_E",    "KC_R",               "KC_Y",
+
+                       "KC_S",                          "KC_G",
+
+            "KC_Z",               "KC_C",    "KC_V",               "KC_N",
+
+            "KC_ESC", "KC_ENT"
+        ]
+    ]
+}

keyboards/dj505/picolx/keymaps/default/readme.md

@@ -0,0 +1,12 @@
+# PicoLX Default Keymap
+
+The default keymap matches the 'Basic 2' preset in Pump It Up Rise. In the game's options menu, navigate to the keyboard settings and press '2' (on your normal computer keyboard) to apply the matching preset.
+
+```
+  Q           E         R           Y
+        S                     G
+  Z           C         V           N
+
+ Service: Escape
+ Test: Enter
+```

keyboards/dj505/picolx/keymaps/menumode/keymap.json

@@ -0,0 +1,36 @@
+{
+    "keyboard": "dj505/picolx",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+            "KC_Q",               "KC_E",    "KC_R",               "KC_Y",
+
+                       "KC_S",                          "KC_G",
+
+            "KC_Z",               "KC_C",    "KC_V",               "KC_N",
+
+            "MO(2)", "TG(1)"
+        ],
+
+        [
+            "KC_Q",               "KC_E",    "KC_TAB",             "KC_UP",
+
+                       "KC_ESC",                        "KC_ENT",
+
+            "KC_LEFT",            "KC_RGHT", "KC_SPC",             "KC_DOWN",
+
+            "LT(2,KC_F1)", "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"
+        ]
+    ]
+}