Commit Graph

62 Commits

Author SHA1 Message Date
Drashna Jaelre
98990f50d7 Additional updates for firmware25 (#411)
Some checks failed
Build firmware / build-firmware (default) (push) Has been cancelled
Build firmware / build-firmware (oryx) (push) Has been cancelled
Unit Tests / test (push) Has been cancelled
* add 75_(ansi|iso) Community Layouts to mechlovin/olly/octagon (#22459)

* expand mechlovin/olly/octagon

* Update info.json

* Rename info.json to keyboard.json

* correct matrix position for key

* remove VIA

* [Core] get_keycode_string(): function to format keycodes as strings, for more readable debug logging. (#24787)

* keycode_string(): Format keycodes as strings.

This adds the `keycode_string()` function described in
https://getreuer.info/posts/keyboards/keycode-string/index.html
as a core feature.

* Fix formatting.

* keycode_string review revisions.

* Rename keycode_string() -> get_keycode_string() for consistency with
  existing string utils like get_u8_str().

* Revise custom keycode names with separate _user and _kb tables.

* Correct indent in builddefs/generic_features.mk.

Co-authored-by: Ryan <fauxpark@gmail.com>

* Add KC_NUHS, KC_NUBS, and KC_CAPS.

* Fix linking error with custom names.

* Attempt at simplifying interface.

* Formatting fix.

* Several fixes and revisions.

* Don't use PSTR in KEYCODE_STRING_NAME, since this fails to build on
  AVR. Store custom names in RAM.
* Revise the internal table of common keycode names to use its own
  storage representation, still in PROGMEM, and now more efficiently
  stored flat in 8 bytes per entry.
* Support Swap Hands keycodes and a few other keycodes.

* Revert "Formatting fix."

This reverts commit 2a2771068c7ee545ffac4103aa07e847a9ec3816.

* Revert "Attempt at simplifying interface."

This reverts commit 8eaf67de76e75bc92d106a8b0decc893fbc65fa5.

* Simplify custom names API by sigprof's suggestion.

* Support more keycodes.

* Add QK_LOCK keycode.
* Add Secure keycodes.
* Add Joystick keycodes.
* Add Programmable Button keycodes.
* Add macro MC_ keycodes.
* For remaining keys in known code ranges, stringify them as
  "QK_<feature>+<number>". For instance, "QK_MIDI+7".

* Bug fix and a few improvements.

* Fix missing right-hand bit when displaying 5-bit mods numerically.
* Support KC_HYPR, KC_MEH, HYPR_T(kc), MEH_T(kc).
* Exclude one-shot keycodes when NO_ACTION_ONESHOT is defined.

---------

Co-authored-by: Ryan <fauxpark@gmail.com>

* Align to latest CLI dependencies (#24553)

* Align to latest CLI dependencies

* Update docs

* Add Community Layout support to daskeyboard4 (#23884)

add ansi CL

* Add the plywrks ply8x hotswap variant. (#23558)

* Add hotswap variant

* Update RGB matrix

* Move files around to target develop

* Revert rules.mk for keyboards/jaykeeb/joker/rules.mk

* Update keyboards/plywrks/ply8x/hotswap/keyboard.json

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Apply suggestions from code review

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Add missing community layouts

* Delete keyboards/plywrks/ply8x/rules.mk

* Update missing keys in RGB matrix

* Add missing key in RGB matrix for hotswap ver

* Remove via keymaps

* Add keyboard alias for plywrks/ply8x to plywrks/ply8x/solder

* Fix typo

* Fix another typo

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* [Core] use `keycode_string` in unit tests (#25042)

* tests: use keycode_string feature

With a proper keycode to string implementation in qmk there is no need
to use the unit tests only implementation anymore.

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>

* tests: remove keycode_util feature

This feature is no longer used as we switched the tests to the
keycode string implementation.

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>

* Non-volatile memory data repository pattern (#24356)

* First batch of eeconfig conversions.

* Offset and length for datablocks.

* `via`, `dynamic_keymap`.

* Fix filename.

* Commentary.

* wilba leds

* satisfaction75

* satisfaction75

* more keyboard whack-a-mole

* satisfaction75

* omnikeyish

* more whack-a-mole

* `generic_features.mk` to automatically pick up nvm repositories

* thievery

* deferred variable resolve

* whitespace

* convert api to structs/unions

* convert api to structs/unions

* convert api to structs/unions

* fixups

* code-side docs

* code size fix

* rollback

* nvm_xxxxx_erase

* Updated location of eeconfig magic numbers so non-EEPROM nvm drivers can use them too.

* Fixup build.

* Fixup compilation error with encoders.

* Build fixes.

* Add `via_ci` keymap to onekey to exercise VIA bindings (and thus dynamic keymap et.al.), fixup compilation errors based on preprocessor+sizeof.

* Build failure rectification.

* Migrate remaining `split.soft_serial_pin` to `split.serial.pin` (#25046)

* Migrate keyboards/bastardkb

* Migrate keyboards/handwired

* Migrate keyboards/helix

* Fix duplicate serial key

* Fix outdated GPIO control function usage (#25060)

* [Modules] Provide access to current path in `rules.mk`. (#25061)

* Update keymap for keycult 1800 (#25070)

Update keymap

Co-authored-by: yiancar <yiancar@gmail.com>

* Add handwired/erikpeyronson/erkbd (#25030)


Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add support for Starry FRL (#24626)


Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Add "Large Lad" keyboard (#24727)

Co-authored-by: jack <jack@pngu.org>

* Bump vite from 5.4.12 to 5.4.15 in /builddefs/docsgen (#25065)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.12 to 5.4.15.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.15/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.15/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

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

* Allow AnnePro2 to reboot (#24886)

Without this, the QK_REBOOT key did nothing.

* Fix path typo related RP2040 (#25069)

Fix path typo

* Update onekey example for nucleo f446re (#25067)

* use accessible pins for nucleo f446re onekey example

* remove pin collision with matrix in keyboard.json

* use accessible pins for LED

* remove pin collision with matrix

* Update readme.md to reflect pin changes

* Module documentation typo correction (#25073)

* Fix lockups on AVR with `qmk/hello_world` module (#25074)

Fix lockups on AVR.

* At101ish (#25072)

* Dell AT101 replacement pcb support

* Update keyboards/at101ish/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* remove empty src clause in makefile

* feature: Update at101ish to qmk v0.28

* feature: Add osdetecting keymap variant.

* refactor: Move at101ish keyboard to handwired folder.

* fix: Adjust at101ish readme-

* fix: review changes.

* chore: Remove unneeded feature.

---------

Co-authored-by: fauxpark <fauxpark@gmail.com>

* Add "license" field to Community Module JSON schema. (#25085)

Add "license" field to community module schema.

* Add kt60HS-T v2 PCB (#25080)

* Add kt60HS-Tv2

* Update keyboards/keyten/kt60hs_t/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v1/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v2/keyboard.json

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v2/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/info.json

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Change of structure

* Moving the keyboard

* Update data/mappings/keyboard_aliases.hjson

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v1/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/keyten/kt60hs_t/v2/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

---------

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Make sure that unit tests run on all release versions

* [ErgoDox EZ] Fix complication issues due to updates

* [ErgoDox EZ] Fix compilication errors and warnings

We want all green!

* Fix 'qmk lint -kb' argument handling (#25093)

* Refactor Deemen17 Works DE60 (#25088)

* Add Coban Pad 12A (#25039)



Co-authored-by: jack <jack@pngu.org>

* [Keyboard] Add PHDesign PH60/Multi Keyboard PCB (#25086)

* Add PH60/Multi Support

* Add PCB PIcture for README

* Remove MO(_FN2)

* README Typo Fix

* Layout and README Adjustment

* Add README for PHDesign Main Folder

* Keymap Improvement

* Update README.md

* [Keyboard] Add Ortho Slayer (#25099)

* Add Ortho Slayer

* Update keyboards/keyten/ortho_slayer/keymaps/default/keymap.c

Co-authored-by: jack <jack@pngu.org>

* Update keyboards/keyten/ortho_slayer/readme.md

Co-authored-by: jack <jack@pngu.org>

---------

Co-authored-by: jack <jack@pngu.org>

* Fix coban pad9a wrong layout in keyboard.json (#25100)

* Remove `CTPC`/`CONVERT_TO_PROTON_C` options (#25111)

* Remove direct docs.qmk.fm links from docs (#25113)

* Add warning when deprecated 'promicro_rp2040' is used (#25112)

* Add Vida to QMK (#24225)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* More Windows->Unix style path fixes. (#25119)

* Include `math.h` where necessary. (#25122)

* Cater for use of `__errno_r()` in ChibiOS syscalls.c with newer picolibc revisions (#25121)

* chore: Allow disabling underglow on Work Louder devices (#25123) (#25120)

* Allow disabling Underglow on Work Louder devices

Allows disabling Underglow on Work Louder devices by using `RGBLIGHT_ENABLE = no` on rules.mk

* Update keyboards/work_louder/rgb_functions.c

Suggested by @zvecr on review.

Co-authored-by: Joel Challis <git@zvecr.com>

---------

Co-authored-by: Joel Challis <git@zvecr.com>

* Exclude external userspace from lint checking (#24680)

* fix: Fix startup sound for Preonic (#25132) (#25133)

Add `AUDIO_INIT_DELAY ` to config.h to resolve

* New standard layout for Savage65 (65_ansi_blocker_tsangan_split_bs) (#24690)

* Added a default firmware and layout for the WindStudio Wind X R1
keyboard.

* Wind X R1: cleaned-up the folders to make clear that this firmware is
for the release 1 of this keyboard.

* Delete keyboards/windstudio/wind_x/R1 directory

Removing the uppercase R1 folder

* feat(cannonkeys/savage65): Added layout to keyboard.json
- Added the layout LAYOUT_65_ansi_blocker_tsangan_split_bs to the
  community layouts.

* kradoindustries_promenade: add LAYOUT_1x2u (#25090)

* Update shuguet/shu89 (#24780)

* Update keyboard.json

Update mod keys location in RGB layout.

* Update keyboard.json

* Update keyboards/shuguet/shu89/keyboard.json

Co-authored-by: Ryan <fauxpark@gmail.com>

---------

Co-authored-by: Ryan <fauxpark@gmail.com>

* [Keyboard] Add suika83opti (#24991)

* [chore]: move and rename mouse/scroll min/max defines (#25141)

* protocol: move {XY/HV}_REPORT_{MIN,MAX} into report.h

..to allow easier re-use in other code implementations.

* protocol: rename {XY/HV}_REPORT_{MIN/MAX} to MOUSE_REPORT_{XY/HV}_{MIN/MAX}

..to avoid naming collisions.

* [Core] Flow Tap tap-hold option to disable HRMs during fast typing (#25125)

aka Global Quick Tap, Require Prior Idle

* Add Link keyboard (#25058)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove Sofle `rgb_default` keymap & tidy readme's (#25010)

* Added Keyboard LumPy27 (#24967)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] Kobold r1 (#25161)

* Kobold r1

* Apply suggestions from code review

Co-authored-by: jack <jack@pngu.org>

* `board_init` => `early_hardware_init_post`.

---------

Co-authored-by: jack <jack@pngu.org>

* [Docs] Unify lighting step descriptions (#25167)

unify lighting step descriptions and defaults across docs

* [Keyboard] Add voidhhkb-hotswap (#25007)

* Added files for voidhhkb-hotswap

* Updated keyboard name to resolve build errors

* Implement suggestions from PR. Use 60_hhkb community layout.

* Update keyboards/void/voidhhkb_hotswap/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Apply suggestions from code review

Co-authored-by: jack <jack@pngu.org>

---------

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <jack@pngu.org>

* Remove duplication of RGB Matrix defaults (#25146)

* Remove duplication of RGB Matrix defaults

* Remove more duplication of defaults

* fix

* Fix missing and extra commas in JSON schema (#25057)

* Remove duplication of RGBLight defaults (#25169)

* Ignore the Layer Lock key in Repeat Key and Caps Word. (#25171)

* Allow for disabling EEPROM subsystem entirely. (#25173)

* [keyboard] ymdk/id75/rp2040 (#25157)

Co-authored-by: tao heihei <>

* Remove `bluefruit_le_read_battery_voltage` function (#25129)

* Fix 'Would you like to clone the submodules?' prompt under msys (#24958)

* Fixup eeconfig lighting reset. (#25166)

* DOCS: `qmk-hid` missing in bootloaders list? (#25177)

* Fix for `.clangd`. (#25180)

* Update develop branch to Pico SDK 1.5.1 (#25178)

* Add lint warning for empty url (#25182)

* Implement connection keycode logic (#25176)

* Add handwired/footy (#25151)

Co-authored-by: jack <jack@pngu.org>

* Decrease firmware size for `anavi/macropad8`. (#25185)

Preparation for bootstrapper.

* Align ChibiOS `USB_WAIT_FOR_ENUMERATION` implementation (#25184)

* [Bug][Core] Fix for Flow Tap: fix handling of distinct taps and timer updates. (#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."

* Remove empty `url` fields (#25181)

* Prompt for converter when creating new keymap (#25116)

* High resolution scrolling (without feature report parsing) (#24423)

* hires scrolling without feature report parsing

* fix valid range for exponent

* fix incorrect minimum exponent value documentation

* Avoid duplication in generated community modules `rules.mk` (#25135)

* Bump rlespinasse/github-slug-action from 3 to 5 (#25021)

* Remove `"console":false` from keyboards (#25190)

* Update 'qmk generate-api' to only publish pure DD keymaps (#24782)

* Remove more duplication of defaults (#25189)

* Align `new-keyboard` template to current standards (#25191)

* Bump vite from 5.4.15 to 5.4.18 in /builddefs/docsgen (#25192)

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

* Fix `boardsource/beiwagon` RGB Matrix coordinates (#25018)

* Remove `"command":false` from keyboards (#25193)

* Extend lint checks to reject duplication of defaults (#25149)

* modelh: add prerequisites for via support (#24932)

* First TypeK support (#22876)

* Add Lemokey X0 keyboard (#24994)

* keyboards/annepro2/ld: Add per-variant linker scripts (#24999)

C18 has an MCU with 16K SRAM, up from C15's 8K.

Split the linker script into C15 and C18 variants to make use of the
larger RAM capacity of C18.

* Add new keyboard MirageiX (#25054)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>

* [Keymap] Sofle RGB - fixed stuck on numpad layer and layout comments (#24942)

* Add handwired 4x14 LuMaWing keyboard (#24885)

* Add jcpm2 (JC Pro Macro 2) (#24816)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* [Keyboard] Add splitkb.com's Halcyon Elora rev2 (#24790)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] mzmkb/slimdash/rev1 (#24804)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Added new keyboard epssp75 (#24756)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Addition of OK-1 (#24646)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add Umbra keyboard (#24569)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Amptrics 0420 keyboard addition (#24744)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* [Core] Enhance Flow Tap to work better for rolls over multiple tap-hold keys. (#25200)

* Flow Tap revision for rolling press.

* Remove debugging cruft.

* Formatting fix.

* amptrics/0422 - Prevent OOB in `update_leds_for_layer` (#25209)

* [Keyboard] Add Gravity-45(#25206)

* add gravity-45

* readme.md

* fix readme

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: jack <0x6a73@protonmail.com>

* run qmk format-json -i keyboards/green_keys/gravity_45/keyboard.json

* add url

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboard.json

* Update keyboard.json

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: Drashna Jaelre <drashna@live.com>

---------

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove redundant keyboard headers (#25208)

* Fix Spleeb compile when pointing device is enabled (#25016)

* [Bug] Minimise force-included files (#25194)

* Add additional hooks for Community modules (#25050)

* Workaround for resolving keyboard alias for config file values (#25228)

* Generate versions to keycode headers (#25219)

* Resolve alias for `qmk new-keymap` keyboard prompts (#25210)

* [Keyboard] Add Binepad KN01 (#25224)

* Add Binepad NeoKnob KN01

* post @waffle87 recommendations

* Add battery changed callbacks (#25207)

* Ensure `qmk_userspace_paths` maintains detected order (#25204)

* Bind Bluetooth driver to `host_driver_t` (#25199)

* Deprecate `qmk generate-compilation-database`. (#25237)

* Remove force disable of NKRO when Bluetooth enabled (#25201)

* Keycult 60 (#25213)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <jack@pngu.org>

* [Keyboard] Add Binepad KnobX1 (#25222)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] Update Tractyl Manuform and add F405 (weact) variant (#24764)

* Layout corrections: Zed60 (#25003)

* Fixed print statement after enabling 32-bit layers (#25027)

* Fix Aurora sweep default keymap configuration (#25148)

* Docs update for installing qmk with uv (#24995)

* CXT Studio 12E3: Fix encoder resolutions not applying (#25242)

* add resolution to encoders so they apply

* Tweak default keymap

* replace KC_UNDO with C(KC_Z) as well

* Add debounce to duplicated defaults check (#25246)

* [Docs] Fix typos introduced by PR #25050 (#25250)

It isn't a drashna PR if there aren't some typos in it somewhere.

* Allow LVGL onekey keymap to be able compile for other board (#25005)

* [Keyboard] Add Jason Hazel’s Bad Wings v2 (#25252)

Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>

* Add raw_hid support to host driver (#25255)

* Fix Wear Leveling compilation (#25254)

* [New Feature/Core] New RGB Matrix Animation "Starlight Smooth" (#25203)

* Enable community modules to define LED matrix and RGB matrix effects. (#25187)

Co-authored-by: Joel Challis <git@zvecr.com>

* Fix OS_DETECTION_KEYBOARD_RESET (#25015)

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Fixes the numlock indicator for Magic Force MF17 numpad (#25260)

* Add Harite v2 keyboard (#24975)

* dlip/haritev2 - Post merge fixes (#25264)

* Remove more USB only branches from NKRO handling (#25263)

* Deprecate `usb.force_nkro`/`FORCE_NKRO` (#25262)

* Add BDN9 Rev. 3 (#25261)

* Remove duplicate of SPI default config from keyboards (#25266)

* Resolve miscellaneous keyboard lint warnings (#25268)

* Add Zeropad (#24737)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* Add Waveshare RP2040-Keyboard-3 support (#25269)

* Update PR checklist notes on custom matrix (#25240)

* Chew folders (#24785)

* gcc15 AVR compilation fixes (#25238)

* [Core] STM32G0x1 support (#24301)

* Use relative paths for schemas, instead of $id. Enables VScode validation. (#25251)

* add doio/kb03 (#24815)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* Move rookiebwoy to ivndbt (#25142)

* [Chore] use {rgblight,rgb_matrix}_hsv_to_rgb overrides (#25271)

* Remove outdated `nix` support due to bit-rot. (#25280)

* Add `compiler_support.h` (#25274)

* Configure boards to use development_board - 0-9 (#25287)

* [Fix] lib8tion: enable fixed scale8 and blend functions (#25272)

lib8tion: enable fixed scale8 and blend functions

These FastLED derived lib8tion functions have been fixed and enabled by
default in FastLED. QMK just never set these defines, there is no reason
to keep the buggy implementation. It is assumed that nobody relied on
the buggy behavior.

* Configure boards to use development_board - UVWXYZ (#25288)

* [Docs] Fix tap_hold code blocks (#25298)

* salicylic_acid3/getta25 - Fix oled keymap (#25295)

* Configure boards to use development_board - S (#25293)

* Configure boards to use development_board - T (#25294)

* 2025 Q2 changelog (#25297)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update Oryx module for newer code

* Soft reset matrix

* Use improved i2c reset for voyager and moonlander matrix

* Fix formatting

* Remove labeler action (unneeded)

* Fix module API version for Oryx module

* Use i2cStop instead of trying to work around

---------

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: QMK Bot <hello@qmk.fm>
Co-authored-by: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: yiancar <yiangosyiangou@cytanet.com.cy>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Erik Peyronson <erikpeyronson@gmail.com>
Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: Sắn <59417802+MaiTheSan@users.noreply.github.com>
Co-authored-by: Hyphen-ated <Hyphen-ated@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Geoffrey Frogeye <s+github@frogeye.fr>
Co-authored-by: lsh4711 <120231876+lsh4711@users.noreply.github.com>
Co-authored-by: Ben Green <bengreen.uk@gmail.com>
Co-authored-by: フィルターペーパー <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: henrikosorensen <henrik.sorensen@gmail.com>
Co-authored-by: Ivan Gromov <38141348+key10iq@users.noreply.github.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com>
Co-authored-by: Dam Vu Duy <RyanDam@users.noreply.github.com>
Co-authored-by: nonameCCC <79012391+nonameCCC@users.noreply.github.com>
Co-authored-by: sudo pacman -Syu <hauvipapro@gmail.com>
Co-authored-by: Andrew Kannan <andrew.kannan@gmail.com>
Co-authored-by: Luis Garcia <luis@bitjester.com>
Co-authored-by: Christian C. Berclaz <christian.berclaz@mac.com>
Co-authored-by: Olivier Mehani <shtrom-github@ssji.net>
Co-authored-by: Sylvain Huguet <sylvain@huguet.me>
Co-authored-by: suikagiken <115451678+suikagiken@users.noreply.github.com>
Co-authored-by: Daniel Reisch <danieljreisch@gmail.com>
Co-authored-by: ClownFish <177758267+clownfish-og@users.noreply.github.com>
Co-authored-by: JamesWilson1996 <47866504+JamesWilson1996@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Jan Bláha <blaha.j502@gmail.com>
Co-authored-by: Eric Molitor <534583+emolitor@users.noreply.github.com>
Co-authored-by: CJ Pais <cj@cjpais.com>
Co-authored-by: eynsai <47629346+eynsai@users.noreply.github.com>
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-authored-by: Álvaro A. Volpato <alvaro.augusto.volpato@gmail.com>
Co-authored-by: Aidan Gauland <aidalgol@users.noreply.github.com>
Co-authored-by: Michał Kopeć <michal@nozomi.space>
Co-authored-by: takashicompany <t@kashi.company>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Matheus Marques <matheusmbar@gmail.com>
Co-authored-by: LucasMateijsen <l.mateijsen@outlook.com>
Co-authored-by: Jeremy Cook <jscook55@gmail.com>
Co-authored-by: VeyPatch <126267034+VeyPatch@users.noreply.github.com>
Co-authored-by: mizma <omoikane@path-works.net>
Co-authored-by: hen-des <141591967+hen-des@users.noreply.github.com>
Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com>
Co-authored-by: josephawilliamsiv <31166673+josephawilliamsiv@users.noreply.github.com>
Co-authored-by: vchowl <vchowl@outlook.com>
Co-authored-by: Christopher Hoage <iam@chrishoage.com>
Co-authored-by: Silvino R. <366673+silvinor@users.noreply.github.com>
Co-authored-by: dabstractor <dustindschultz@gmail.com>
Co-authored-by: Nathan Cain <13713501+nathanscain@users.noreply.github.com>
Co-authored-by: muge <221161+muge@users.noreply.github.com>
Co-authored-by: HorrorTroll <sonicvipduc@gmail.com>
Co-authored-by: cyxae <cyxae@amphitryon.nrst.fr>
Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>
Co-authored-by: art-was-here <mail@buckles.email>
Co-authored-by: Matti Hiljanen <170205+qvr@users.noreply.github.com>
Co-authored-by: Wasteland Fluttershy <ingvardm@gmail.com>
Co-authored-by: Dane Lipscombe <danelipscombe@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
Co-authored-by: Infos <136488157+diffrentGuesser@users.noreply.github.com>
Co-authored-by: Florent Linguenheld <f@linguenheld.fr>
Co-authored-by: ivan <81021475+ivndbt@users.noreply.github.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
2025-06-04 15:26:21 +07:00
Nick Brassel
1efc82403b Community modules (#24848) 2025-02-26 22:25:41 +11:00
Nick Brassel
7d8f193988 Allow codegen of keymap.json => keymap.c without requiring layers/layout etc. (#23451) 2024-11-24 20:32:30 +11:00
QMK Bot
2c6409fdd8 Merge remote-tracking branch 'origin/master' into develop 2024-08-12 12:34:54 +00:00
Nick Brassel
380e0c9cad Userspace: add support for adding environment variables during build (#22887) 2024-08-12 22:34:22 +10:00
QMK Bot
c25b3bbe90 Merge remote-tracking branch 'origin/master' into develop 2024-07-24 05:17:22 +00:00
Nick Brassel
8c35011d0a [CLI] Only generate files if contents change. (#24038)
Don't overwrite if the content doesn't change.
2024-07-24 06:16:51 +01:00
Ryan
0a5b892820 [CLI] Force dump_lines() to always use Unix line endings (#23954) 2024-06-19 19:43:23 +01:00
Nick Brassel
0262161914 [CLI] Don't exit() when certain exceptions occur. (#23442) 2024-06-15 10:37:47 +01:00
Nick Brassel
5501e804ff QMK Userspace (#22222)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 07:53:43 +11:00
Nick Brassel
46b996a55e CLI parallel search updates (#22525) 2023-11-22 11:14:34 +11:00
Nick Brassel
4938210711 CLI refactoring for common build target APIs (#22221) 2023-11-15 16:24:54 +11:00
Nick Brassel
127560ae22 Add qmk ci-validate-aliases (#22205) 2023-10-06 10:34:23 +11:00
Joel Challis
27ff1d4153 Remove layout aliases from keyboard_aliases.hjson (#21658) 2023-08-01 01:54:28 +01:00
Nick Brassel
ffdc70bf0a Consolidate KEYBOARD_OUTPUT+KEYMAP_OUTPUT=>INTERMEDIATE_OUTPUT (#21272) 2023-06-21 08:41:49 +10:00
Albert Y
47a51fda5d Append user variables to the end of make command (#20177) 2023-04-03 15:20:39 +10:00
Albert Y
0e1e543836 Increase verbosity of make command (#20172) 2023-03-21 01:25:08 -07:00
Ryan
479d8de622 Format DD mappings and schemas (#18924) 2022-11-08 01:05:08 +00:00
Joel Challis
0b41c13509 [CLI] Ensure consistent clean behaviour (#18781) 2022-10-20 14:35:27 +01:00
Joel Challis
fc0330a54a Correctly build keymap.json containing additional config (#18766) 2022-10-19 11:29:44 +01:00
QMK Bot
3a08deb7fe Merge remote-tracking branch 'origin/master' into develop 2022-03-18 16:02:57 +00:00
Joel Challis
ed773ab73c Relocate CLI git interactions (#16682) 2022-03-18 16:02:24 +00:00
zvecr
bffb209eee Merge remote-tracking branch 'origin/master' into develop 2022-03-18 01:15:23 +00:00
Joel Challis
e5823b5650 [CLI] Add common util for dumping generated content (#16674) 2022-03-18 01:09:29 +00:00
Erovia
fbfd5312b9 CLI: Validate JSON keymap input (#16261)
* Fix schema validator

It should use the passed schema.

* Add required attributes to keymap schema

* Rework subcommands to validate the JSON keymaps

The 'compile', 'flash' and 'json2c' subcommands were reworked to add
JSON keymap validation so error is reported for non-JSON and
non-compliant-JSON inputs.

* Fix required fields in keymap schema

* Add tests

* Fix compiling keymaps directly from keymap directory

* Schema should not require version for now.
2022-02-28 20:02:39 +00:00
Joel Challis
f7e7671f69 Migrate more makefile utilities to builddefs sub-directory (#16002) 2022-02-10 09:45:51 -08:00
Ryan
c9f88d7c67 qmk doctor: display qmk_firmware version tag (#16155) 2022-02-01 20:31:42 -08:00
Zach White
08ce0142ba Macros in JSON keymaps (#14374)
* macros in json keymaps

* add advanced macro support to json

* add a note about escaping macro strings

* add simple examples

* format json

* add support for language specific keymap extras

* switch to dictionaries instead of inline text for macros

* use SS_TAP on the innermost tap keycode

* add the new macro format to the schema

* document the macro limit

* add the json keyword for syntax highlighting

* fix format that vscode screwed up

* Update feature_macros.md

* add tests for macros

* change ding to beep

* add json support for SENDSTRING_BELL

* update doc based on feedback from sigprof

* document host_layout

* remove unused var

* improve carriage return handling

* support tab characters as well

* Update docs/feature_macros.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

* escape backslash characters

* format

* flake8

* Update quantum/quantum_keycodes.h

Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-11-22 11:11:35 -08:00
Bao
590b405468 New CLI subcommand to create clang-compatible compilation database (compile_commands.json) (#14370)
* pulled source from dev branch

* missed a file from origin

* formatting

* revised argument names. relaxed matching rules to work for avr too

* add docstrings

* added docs. tightened up regex

* remove unused imports

* cleaning up command file. use existing qmk dir constant

* rename parser library file

* move lib functions into command file. there are only 2 and they aren't large

* currently debugging...

* more robustly find config

* updated docs

* remove unused imports

* reuse make executable from the main make command

* pulled source from dev branch

* missed a file from origin

* formatting

* revised argument names. relaxed matching rules to work for avr too

* add docstrings

* added docs. tightened up regex

* remove unused imports

* cleaning up command file. use existing qmk dir constant

* rename parser library file

* move lib functions into command file. there are only 2 and they aren't large

* currently debugging...

* more robustly find config

* updated docs

* remove unused imports

* reuse make executable from the main make command

* remove MAKEFLAGS from environment for better control over process management

* Update .gitignore

Co-authored-by: Michael Forster <forster@google.com>

* add a usage line to docs

* doc change as suggested

Co-authored-by: Nick Brassel <nick@tzarc.org>

* rename command

* remove debug print statements

* generate-compilation-database: fix arg handling

* generate-comilation-db: improve error handling

* use cli.run() instead of Popen()

Co-authored-by: Xton <cdewan@apple.com>
Co-authored-by: Christon DeWan <cmdpix@mac.com>
Co-authored-by: Michael Forster <forster@google.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-09-16 14:59:57 +10:00
Zach White
596c4a1f87 Remove bin/qmk (#14231)
* Remove the bin/qmk script

* remove bin/qmk from workflows
2021-08-29 16:50:22 -07:00
ruro
3b28178deb --parallel improvements (#13800)
* improve make parallel jobs support

* document the --parallel option

* disable the output-sync for interactive targets
2021-08-18 08:46:59 +10:00
Ryan
b021c2f2c5 Port new_keyboard.sh to CLI (#13706)
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-07-30 21:57:40 +01:00
Erovia
e05f9c4a08 CLI: Add git and venv info to doctor's output (#13405)
Most of the checks are saved from zvecr's retired 'up/status'
subcommand PR.
2021-07-10 16:04:50 +01:00
Ryan
bbe43a91eb CLI: Add subcommand to generate version.h (#13151) 2021-06-27 02:29:02 +10:00
Zach White
6955c5a002 Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
	lib/python/qmk/tests/test_cli_commands.py
	util/install/fedora.sh
2021-05-19 15:49:11 -07:00
Zach White
db1eacdaac Align our subprocess usage with current best practices. (#12940)
* Align our subprocess usage with current best practices.

* remove unused import

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* fix the cpp invocation for older python

* allow for unprompted installation

* make sure qmk new-keyboard works on windows

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-19 15:24:46 -07:00
QMK Bot
2f367bab98 Merge remote-tracking branch 'origin/master' into develop 2021-05-09 17:20:16 +00:00
Erovia
30aae6298b CLI: Use BASH if SHELL variable is not set (Windows) (#12847) 2021-05-09 19:19:42 +02:00
QMK Bot
a0c95cb07e Merge remote-tracking branch 'origin/master' into develop 2021-05-09 10:58:43 +00:00
Joel Challis
7725d813c9 Allow MAKE environment override for 'qmk clean' (#12473) 2021-05-09 12:57:49 +02:00
QMK Bot
0dc0516f0c Merge remote-tracking branch 'origin/master' into develop 2021-03-24 16:27:28 +00:00
Zach White
299008be36 Add support for qmk_configurator style aliases (#11954)
* Add support for qmk_configurator style aliases

* add the keyboard aliases to the api data

* add support for a keyboard metadata file

* make flake8 happy
2021-03-24 09:26:38 -07:00
Zach White
f2715a0593 Consistently use bin/qmk when that script is called (#12286)
* Pass QMK_BIN down to build_keyboard.mk

* choose the correct qmk script
2021-03-18 16:10:40 -07:00
QMK Bot
25ec655162 Merge remote-tracking branch 'origin/master' into develop 2021-03-09 21:37:12 +00:00
Ryan
aed8bace97 Fix typo in get_git_version() (#12182) 2021-03-10 08:36:39 +11:00
Zach White
b0069c5c05 Begin the process of deprecating bin/qmk in favor of the global cli (#12109)
* Begin the process of deprecating bin/qmk in favor of the global cli

* Correctly set the qmk bin
2021-03-07 19:10:03 -08:00
Erovia
7db826dce8 CLI: Fix json flashing (#11765) 2021-02-01 20:55:35 +01:00
Zach White
111eb8990d Fix QMK_BUILDDATE (#11641) 2021-01-20 20:38:18 +00:00
Zach White
da40242dbc Generate version.h when compiling json files (#11581)
* generate version.h when compiling json files

* make flake8 happy

* fix formatting and verbose

* quiet up the compile output
2021-01-17 17:33:29 +00:00
Zach White
d9785ec313 Improve the compile and flash subcommands (#11334)
* add support for --clean to compile and flash

* compile standalone JSON keymaps without polluting the tree

* Add support for passing environment vars to make

* make flake8 happy

* document changes to qmk compile and flash

* add -e support to json export compiling

* Fix python 3.6

* honor $MAKE

* add support for parallel builds
2021-01-16 15:13:04 -08:00