mirror of
https://github.com/zsa/qmk_firmware.git
synced 2026-01-09 15:12:33 +00:00
* 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>
496 lines
18 KiB
Makefile
496 lines
18 KiB
Makefile
ifndef VERBOSE
|
|
.SILENT:
|
|
endif
|
|
|
|
# Never run this makefile in parallel, as it could screw things up
|
|
# It won't affect the submakes, so you still get the speedup from specifying -jx
|
|
.NOTPARALLEL:
|
|
|
|
# Allow the silent with lower caps to work the same way as upper caps
|
|
ifdef silent
|
|
SILENT = $(silent)
|
|
endif
|
|
|
|
ifdef SILENT
|
|
SUB_IS_SILENT := $(SILENT)
|
|
endif
|
|
|
|
# We need to make sure that silent is always turned off at the top level
|
|
# Otherwise the [OK], [ERROR] and [WARN] messages won't be displayed correctly
|
|
override SILENT := false
|
|
|
|
ifeq ($(shell git rev-parse --is-inside-work-tree 2>/dev/null),)
|
|
export SKIP_GIT := yes
|
|
export NOT_REPO := yes
|
|
endif
|
|
|
|
ifdef SKIP_VERSION
|
|
export SKIP_GIT := yes
|
|
endif
|
|
|
|
ifndef SUB_IS_SILENT
|
|
ifndef SKIP_GIT
|
|
QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null)
|
|
endif
|
|
|
|
ifneq ($(QMK_VERSION),)
|
|
$(info QMK Firmware $(QMK_VERSION))
|
|
endif
|
|
endif
|
|
|
|
# Try to determine userspace from qmk config, if set.
|
|
ifeq ($(QMK_USERSPACE),)
|
|
QMK_USERSPACE = $(shell qmk config -ro user.overlay_dir | cut -d= -f2 | sed -e 's@^None$$@@g')
|
|
endif
|
|
|
|
# Determine which qmk cli to use
|
|
QMK_BIN := qmk
|
|
|
|
# avoid 'Entering|Leaving directory' messages
|
|
MAKEFLAGS += --no-print-directory
|
|
|
|
ON_ERROR := error_occurred=1
|
|
|
|
BREAK_ON_ERRORS = no
|
|
|
|
ROOT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
|
|
ifeq ($(ROOT_DIR),)
|
|
ROOT_DIR := .
|
|
endif
|
|
|
|
include paths.mk
|
|
include $(BUILDDEFS_PATH)/support.mk
|
|
|
|
TEST_OUTPUT_DIR := $(BUILD_DIR)/test
|
|
ERROR_FILE := $(BUILD_DIR)/error_occurred
|
|
|
|
.DEFAULT_GOAL := all:all
|
|
|
|
|
|
# Compare the start of the RULE variable with the first argument($1)
|
|
# If the rules equals $1 or starts with $1:, RULE_FOUND is set to true
|
|
# and $1 is removed from the RULE variable
|
|
# Otherwise the RULE_FOUND variable is set to false, and RULE left as it was
|
|
# The function is a bit tricky, since there's no built in $(startswith) function
|
|
define COMPARE_AND_REMOVE_FROM_RULE_HELPER
|
|
ifeq ($1,$$(RULE))
|
|
RULE:=
|
|
RULE_FOUND := true
|
|
else
|
|
STARTCOLON_REMOVED=$$(subst START$1:,,START$$(RULE))
|
|
ifneq ($$(STARTCOLON_REMOVED),START$$(RULE))
|
|
RULE_FOUND := true
|
|
RULE := $$(STARTCOLON_REMOVED)
|
|
else
|
|
RULE_FOUND := false
|
|
endif
|
|
endif
|
|
endef
|
|
|
|
# This makes it easier to call COMPARE_AND_REMOVE_FROM_RULE, since it makes it behave like
|
|
# a function that returns the value
|
|
COMPARE_AND_REMOVE_FROM_RULE = $(eval $(call COMPARE_AND_REMOVE_FROM_RULE_HELPER,$1))$(RULE_FOUND)
|
|
|
|
# Try to find a match for the start of the rule to be checked
|
|
# $1 The list to be checked
|
|
# If a match is found, then RULE_FOUND is set to true
|
|
# and MATCHED_ITEM to the item that was matched
|
|
define TRY_TO_MATCH_RULE_FROM_LIST_HELPER
|
|
# Split on ":", padding with empty strings to avoid indexing issues
|
|
TOKEN1:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[0])" $$(RULE))
|
|
TOKENr:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[1])" $$(RULE))
|
|
|
|
FOUNDx:=$$(shell echo $1 | tr " " "\n" | grep -Fx $$(TOKEN1))
|
|
ifneq ($$(FOUNDx),)
|
|
RULE := $$(TOKENr)
|
|
RULE_FOUND := true
|
|
MATCHED_ITEM := $$(TOKEN1)
|
|
else
|
|
RULE_FOUND := false
|
|
MATCHED_ITEM :=
|
|
endif
|
|
endef
|
|
|
|
# Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST
|
|
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 DEFAULT_FOLDER and 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))
|
|
TOKENr:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[1])" $$(RULE))
|
|
|
|
TOKEN1:=$$(shell $(QMK_BIN) resolve-alias --allow-unknown $$(TOKEN1))
|
|
|
|
FOUNDx:=$$(shell echo $1 | tr " " "\n" | grep -Fx $$(TOKEN1))
|
|
ifneq ($$(FOUNDx),)
|
|
RULE := $$(TOKENr)
|
|
RULE_FOUND := true
|
|
MATCHED_ITEM := $$(TOKEN1)
|
|
else
|
|
RULE_FOUND := false
|
|
MATCHED_ITEM :=
|
|
endif
|
|
endef
|
|
|
|
# Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST_KB
|
|
TRY_TO_MATCH_RULE_FROM_LIST_KB = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER_KB,$1))$(RULE_FOUND)
|
|
|
|
define ALL_IN_LIST_LOOP
|
|
OLD_RULE$1 := $$(RULE)
|
|
$$(eval $$(call $1,$$(ITEM$1)))
|
|
RULE := $$(OLD_RULE$1)
|
|
endef
|
|
|
|
define PARSE_ALL_IN_LIST
|
|
$$(foreach ITEM$1,$2,$$(eval $$(call ALL_IN_LIST_LOOP,$1)))
|
|
endef
|
|
|
|
# The entry point for rule parsing
|
|
# parses a rule in the format <keyboard>:<keymap>:<target>
|
|
# but this particular function only deals with the first <keyboard> part
|
|
define PARSE_RULE
|
|
RULE := $1
|
|
COMMANDS :=
|
|
# If the rule starts with all, then continue the parsing from
|
|
# PARSE_ALL_KEYBOARDS
|
|
ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
|
|
KEYBOARD_RULE=all
|
|
$$(eval $$(call PARSE_ALL_KEYBOARDS))
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,test),true)
|
|
$$(eval $$(call PARSE_TEST))
|
|
# If the rule starts with the name of a known keyboard, then continue
|
|
# the parsing from PARSE_KEYBOARD
|
|
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST_KB,$$(shell $(QMK_BIN) list-keyboards)),true)
|
|
KEYBOARD_RULE=$$(MATCHED_ITEM)
|
|
$$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
|
|
else
|
|
$$(info make: *** No rule to make target '$1'. Stop.)
|
|
$$(info |)
|
|
$$(info | QMK's make format is:)
|
|
$$(info | make keyboard_folder:keymap_folder[:target])
|
|
$$(info |)
|
|
$$(info | Where `keyboard_folder` is the path to the keyboard relative to)
|
|
$$(info | `qmk_firmware/keyboards/`, and `keymap_folder` is the name of the)
|
|
$$(info | keymap folder under that board's `keymaps/` directory.)
|
|
$$(info |)
|
|
$$(info | Examples:)
|
|
$$(info | keyboards/dz60, keyboards/dz60/keymaps/default)
|
|
$$(info | -> make dz60:default)
|
|
$$(info | -> qmk compile -kb dz60 -km default)
|
|
$$(info | keyboards/planck/rev6, keyboards/planck/keymaps/default)
|
|
$$(info | -> make planck/rev6:default:flash)
|
|
$$(info | -> qmk flash -kb planck/rev6 -km default)
|
|
$$(info |)
|
|
endif
|
|
endef
|
|
|
|
# $1 = Keyboard
|
|
# Parses a rule in the format <keymap>:<target>
|
|
# the keyboard is already known when entering this function
|
|
define PARSE_KEYBOARD
|
|
# If we want to compile the default subproject, then we need to
|
|
# include the correct makefile to determine the actual name of it
|
|
CURRENT_KB := $1
|
|
|
|
# 5/4/3/2/1
|
|
KEYBOARD_FOLDER_PATH_1 := $$(CURRENT_KB)
|
|
KEYBOARD_FOLDER_PATH_2 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_1)))
|
|
KEYBOARD_FOLDER_PATH_3 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_2)))
|
|
KEYBOARD_FOLDER_PATH_4 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_3)))
|
|
KEYBOARD_FOLDER_PATH_5 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_4)))
|
|
|
|
KEYMAPS :=
|
|
# get a list of all keymaps
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/keymaps/*/.)))
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/keymaps/*/.)))
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
|
|
|
|
ifneq ($(QMK_USERSPACE),)
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/keymaps/*/.)))
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/keymaps/*/.)))
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
|
|
endif
|
|
|
|
KEYBOARD_LAYOUTS := $(shell $(QMK_BIN) list-layouts --keyboard $1)
|
|
LAYOUT_KEYMAPS :=
|
|
$$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
|
|
ifneq ($(QMK_USERSPACE),)
|
|
$$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/layouts/$$(LAYOUT)/*/.)))))
|
|
endif
|
|
|
|
KEYMAPS := $$(sort $$(KEYMAPS) $$(LAYOUT_KEYMAPS))
|
|
|
|
# if the rule after removing the start of it is empty (we haven't specified a kemap or target)
|
|
# compile all the keymaps
|
|
ifeq ($$(RULE),)
|
|
$$(eval $$(call PARSE_ALL_KEYMAPS))
|
|
# The same if all was specified
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
|
|
$$(eval $$(call PARSE_ALL_KEYMAPS))
|
|
# List all keymaps for the given keyboard
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,list-keymaps),true)
|
|
$$(eval $$(call LIST_ALL_KEYMAPS))
|
|
# Try to match the specified keyamp with the list of known keymaps
|
|
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true)
|
|
$$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM)))
|
|
# Otherwise try to match the keymap from the current folder, or arguments to the make command
|
|
else ifneq ($$(KEYMAP),)
|
|
$$(eval $$(call PARSE_KEYMAP,$$(KEYMAP)))
|
|
# Otherwise if we are running make all:<user> just skip
|
|
else ifeq ($$(KEYBOARD_RULE),all)
|
|
# $$(info Skipping: No user keymap for $$(CURRENT_KB))
|
|
# Otherwise, make all keymaps, again this is consistent with how it works without
|
|
# any arguments
|
|
else
|
|
$$(eval $$(call PARSE_ALL_KEYMAPS))
|
|
endif
|
|
endef
|
|
|
|
# if we are going to compile all keyboards, match the rest of the rule
|
|
# for each of them
|
|
define PARSE_ALL_KEYBOARDS
|
|
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)))
|
|
endef
|
|
|
|
# Prints a list of all known keymaps for the given keyboard
|
|
define LIST_ALL_KEYMAPS
|
|
COMMAND_true_LIST_KEYMAPS := \
|
|
printf "$$(KEYMAPS)\n";
|
|
COMMAND_false_LIST_KEYMAPS := \
|
|
printf "$$(MSG_AVAILABLE_KEYMAPS)\n"; \
|
|
printf "$$(KEYMAPS)\n";
|
|
COMMANDS += LIST_KEYMAPS
|
|
endef
|
|
|
|
# $1 Keymap
|
|
# This is the meat of compiling a keyboard, when entering this, everything is known
|
|
# keyboard, subproject, and keymap
|
|
# Note that we are not directly calling the command here, but instead building a list,
|
|
# which will later be processed
|
|
define PARSE_KEYMAP
|
|
CURRENT_KM = $1
|
|
# The rest of the rule is the target
|
|
# Remove the leading ":" from the target, as it acts as a separator
|
|
MAKE_TARGET := $$(patsubst :%,%,$$(RULE))
|
|
# We need to generate an unique identifier to append to the COMMANDS list
|
|
CURRENT_KB_UNDER := $$(subst /,_,$$(CURRENT_KB))
|
|
COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB_UNDER)_KEYMAP_$$(CURRENT_KM)
|
|
# If we are compiling a keyboard without a subproject, we want to display just the name
|
|
# of the keyboard, otherwise keyboard/subproject
|
|
KB_SP := $$(CURRENT_KB)
|
|
# Format it in bold
|
|
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
|
|
# Specify the variables that we are passing forward to submake
|
|
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) QMK_BIN=$$(QMK_BIN)
|
|
# And the first part of the make command
|
|
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_keyboard.mk $$(MAKE_TARGET)
|
|
# The message to display
|
|
MAKE_MSG := $$(MSG_MAKE_KB)
|
|
# We run the command differently, depending on if we want more output or not
|
|
# The true version for silent output and the false version otherwise
|
|
$$(eval $$(call BUILD))
|
|
endef
|
|
|
|
define BUILD
|
|
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
|
|
COMMANDS += $$(COMMAND)
|
|
COMMAND_true_$$(COMMAND) := \
|
|
printf "$$(MAKE_MSG)" | \
|
|
$$(MAKE_MSG_FORMAT); \
|
|
LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \
|
|
if [ $$$$? -gt 0 ]; \
|
|
then $$(PRINT_ERROR_PLAIN); \
|
|
elif [ "$$$$LOG" = "skipped" ] ; \
|
|
then $$(PRINT_SKIPPED_PLAIN); \
|
|
elif [ "$$$$LOG" != "" ] ; \
|
|
then $$(PRINT_WARNING_PLAIN); \
|
|
else \
|
|
$$(PRINT_OK); \
|
|
fi;
|
|
COMMAND_false_$$(COMMAND) := \
|
|
printf "$$(MAKE_MSG)\n\n"; \
|
|
$$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; \
|
|
if [ $$$$? -gt 0 ]; \
|
|
then error_occurred=1; \
|
|
fi;
|
|
endef
|
|
|
|
# Just parse all the keymaps for a specific keyboard
|
|
define PARSE_ALL_KEYMAPS
|
|
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS)))
|
|
endef
|
|
|
|
define BUILD_TEST
|
|
TEST_PATH := $1
|
|
TEST_NAME := $$(notdir $$(TEST_PATH))
|
|
TEST_FULL_NAME := $$(subst /,_,$$(patsubst $$(ROOT_DIR)tests/%,%,$$(TEST_PATH)))
|
|
MAKE_TARGET := $2
|
|
COMMAND := $1
|
|
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_test.mk $$(MAKE_TARGET)
|
|
MAKE_VARS := TEST=$$(TEST_NAME) TEST_OUTPUT=$$(TEST_FULL_NAME) TEST_PATH=$$(TEST_PATH) FULL_TESTS="$$(FULL_TESTS)"
|
|
MAKE_MSG := $$(MSG_MAKE_TEST)
|
|
$$(eval $$(call BUILD))
|
|
ifneq ($$(MAKE_TARGET),clean)
|
|
TEST_EXECUTABLE := $$(TEST_OUTPUT_DIR)/$$(TEST_FULL_NAME).elf
|
|
TESTS += $$(TEST_FULL_NAME)
|
|
TEST_MSG := $$(MSG_TEST)
|
|
$$(TEST_FULL_NAME)_COMMAND := \
|
|
printf "$$(TEST_MSG)\n"; \
|
|
$$(TEST_EXECUTABLE); \
|
|
if [ $$$$? -gt 0 ]; \
|
|
then error_occurred=1; \
|
|
fi; \
|
|
printf "\n";
|
|
endif
|
|
endef
|
|
|
|
define LIST_TEST
|
|
include $(BUILDDEFS_PATH)/testlist.mk
|
|
FOUND_TESTS := $$(patsubst ./tests/%,%,$$(TEST_LIST))
|
|
$$(info $$(FOUND_TESTS))
|
|
endef
|
|
|
|
define PARSE_TEST
|
|
TESTS :=
|
|
TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
|
|
TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
|
|
include $(BUILDDEFS_PATH)/testlist.mk
|
|
ifeq ($$(TEST_NAME),all)
|
|
MATCHED_TESTS := $$(TEST_LIST)
|
|
else
|
|
MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring x$$(TEST_NAME)x, x$$(patsubst ./tests/%,%,$$(TEST)x)), $$(TEST),))
|
|
endif
|
|
$$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
|
|
endef
|
|
|
|
|
|
# Set the silent mode depending on if we are trying to compile multiple keyboards or not
|
|
# By default it's on in that case, but it can be overridden by specifying silent=false
|
|
# from the command line
|
|
define SET_SILENT_MODE
|
|
ifdef SUB_IS_SILENT
|
|
SILENT_MODE := $(SUB_IS_SILENT)
|
|
else ifeq ($$(words $$(COMMANDS)),1)
|
|
SILENT_MODE := false
|
|
else
|
|
SILENT_MODE := true
|
|
endif
|
|
endef
|
|
|
|
include $(BUILDDEFS_PATH)/message.mk
|
|
|
|
ifeq ($(strip $(BREAK_ON_ERRORS)), yes)
|
|
HANDLE_ERROR = exit 1
|
|
else
|
|
HANDLE_ERROR = echo $$error_occurred > $(ERROR_FILE)
|
|
endif
|
|
|
|
# The empty line is important here, as it will force a new shell to be created for each command
|
|
# Otherwise the command line will become too long with a lot of keyboards and keymaps
|
|
define RUN_COMMAND
|
|
+error_occurred=0;\
|
|
$(COMMAND_$(SILENT_MODE)_$(COMMAND))\
|
|
if [ $$error_occurred -gt 0 ]; then $(HANDLE_ERROR); fi;
|
|
|
|
|
|
endef
|
|
define RUN_TEST
|
|
+error_occurred=0;\
|
|
$($(TEST)_COMMAND)\
|
|
if [ $$error_occurred -gt 0 ]; then $(HANDLE_ERROR); fi;
|
|
|
|
|
|
endef
|
|
|
|
# Catch everything and parse the command line ourselves.
|
|
.PHONY: %
|
|
%:
|
|
# Ensure that $(QMK_BIN) works.
|
|
if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi
|
|
ifdef NOT_REPO
|
|
printf "$(MSG_NOT_REPO)"
|
|
endif
|
|
ifndef SKIP_GIT
|
|
$(QMK_BIN) git-submodule --sync
|
|
# Check if the submodules are dirty, and display a warning if they are
|
|
if ! $(QMK_BIN) git-submodule --check 1> /dev/null 2>&1; then printf "$(MSG_SUBMODULE_DIRTY)"; fi
|
|
endif
|
|
rm -f $(ERROR_FILE) > /dev/null 2>&1
|
|
$(eval $(call PARSE_RULE,$@))
|
|
$(eval $(call SET_SILENT_MODE))
|
|
# Run all the commands in the same shell, notice the + at the first line
|
|
# it has to be there to allow parallel execution of the submake
|
|
# This always tries to compile everything, even if error occurs in the middle
|
|
# But we return the error code at the end, to trigger travis failures
|
|
# The sort at this point is to remove duplicates
|
|
$(foreach COMMAND,$(sort $(COMMANDS)),$(RUN_COMMAND))
|
|
if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
|
|
$(foreach TEST,$(sort $(TESTS)),$(RUN_TEST))
|
|
if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
|
|
|
|
lib/%:
|
|
git submodule sync $?
|
|
git submodule update --init $?
|
|
|
|
.PHONY: git-submodule
|
|
git-submodule:
|
|
$(QMK_BIN) git-submodule
|
|
|
|
.PHONY: git-submodules
|
|
git-submodules: git-submodule
|
|
|
|
.PHONY: list-keyboards
|
|
list-keyboards:
|
|
$(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
|
|
|
|
.PHONY: list-tests
|
|
list-tests:
|
|
$(eval $(call LIST_TEST))
|
|
|
|
.PHONY: generate-keyboards-file
|
|
generate-keyboards-file:
|
|
$(QMK_BIN) list-keyboards --no-resolve-defaults
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
echo -n 'Deleting .build/ ... '
|
|
rm -rf $(BUILD_DIR)
|
|
echo 'done.'
|
|
|
|
.PHONY: distclean distclean_qmk
|
|
distclean: distclean_qmk
|
|
distclean_qmk: clean
|
|
echo -n 'Deleting *.bin, *.hex, and *.uf2 ... '
|
|
rm -f *.bin *.hex *.uf2
|
|
echo 'done.'
|
|
|
|
ifneq ($(QMK_USERSPACE),)
|
|
.PHONY: distclean_userspace
|
|
distclean: distclean_userspace
|
|
distclean_userspace: clean
|
|
echo -n 'Deleting userspace *.bin, *.hex, and *.uf2 ... '
|
|
rm -f $(QMK_USERSPACE)/*.bin $(QMK_USERSPACE)/*.hex $(QMK_USERSPACE)/*.uf2
|
|
echo 'done.'
|
|
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"
|
|
|
|
.PHONY: pytest
|
|
pytest:
|
|
RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); 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"
|