mirror of
https://github.com/zsa/qmk_firmware.git
synced 2026-01-15 09:59:32 +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>
1079 lines
41 KiB
Python
1079 lines
41 KiB
Python
"""Functions that help us generate and use info.json files.
|
|
"""
|
|
import re
|
|
import os
|
|
from pathlib import Path
|
|
import jsonschema
|
|
from dotty_dict import dotty
|
|
|
|
from milc import cli
|
|
|
|
from qmk.constants import COL_LETTERS, ROW_LETTERS, CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS, JOYSTICK_AXES
|
|
from qmk.c_parse import find_layouts, parse_config_h_file, find_led_config
|
|
from qmk.json_schema import deep_update, json_load, validate
|
|
from qmk.keyboard import config_h, rules_mk
|
|
from qmk.commands import parse_configurator_json
|
|
from qmk.makefile import parse_rules_mk_file
|
|
from qmk.math import compute
|
|
from qmk.util import maybe_exit, truthy
|
|
|
|
true_values = ['1', 'on', 'yes']
|
|
false_values = ['0', 'off', 'no']
|
|
|
|
|
|
def _keyboard_in_layout_name(keyboard, layout):
|
|
"""Validate that a layout macro does not contain name of keyboard
|
|
"""
|
|
# TODO: reduce this list down
|
|
safe_layout_tokens = {
|
|
'ansi',
|
|
'iso',
|
|
'jp',
|
|
'jis',
|
|
'ortho',
|
|
'wkl',
|
|
'tkl',
|
|
'preonic',
|
|
'planck',
|
|
}
|
|
|
|
# Ignore tokens like 'split_3x7_4' or just '2x4'
|
|
layout = re.sub(r"_split_\d+x\d+_\d+", '', layout)
|
|
layout = re.sub(r"_\d+x\d+", '', layout)
|
|
|
|
name_fragments = set(keyboard.split('/')) - safe_layout_tokens
|
|
|
|
return any(fragment in layout for fragment in name_fragments)
|
|
|
|
|
|
def _valid_community_layout(layout):
|
|
"""Validate that a declared community list exists
|
|
"""
|
|
return (Path('layouts/default') / layout).exists()
|
|
|
|
|
|
def _get_key_left_position(key):
|
|
# Special case for ISO enter
|
|
return key['x'] - 0.25 if key.get('h', 1) == 2 and key.get('w', 1) == 1.25 else key['x']
|
|
|
|
|
|
def _find_invalid_encoder_index(info_data):
|
|
"""Perform additional validation of encoders
|
|
"""
|
|
enc_left = info_data.get('encoder', {}).get('rotary', [])
|
|
enc_right = []
|
|
|
|
if info_data.get('split', {}).get('enabled', False):
|
|
enc_right = info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', enc_left)
|
|
|
|
enc_count = len(enc_left) + len(enc_right)
|
|
|
|
ret = []
|
|
layouts = info_data.get('layouts', {})
|
|
for layout_name, layout_data in layouts.items():
|
|
found = set()
|
|
for key in layout_data['layout']:
|
|
if 'encoder' in key:
|
|
if enc_count == 0:
|
|
ret.append((layout_name, key['encoder'], 'non-configured'))
|
|
elif key['encoder'] >= enc_count:
|
|
ret.append((layout_name, key['encoder'], 'out of bounds'))
|
|
elif key['encoder'] in found:
|
|
ret.append((layout_name, key['encoder'], 'duplicate'))
|
|
found.add(key['encoder'])
|
|
|
|
return ret
|
|
|
|
|
|
def _validate_build_target(keyboard, info_data):
|
|
"""Non schema checks
|
|
"""
|
|
keyboard_json_path = Path('keyboards') / keyboard / 'keyboard.json'
|
|
config_files = find_info_json(keyboard)
|
|
|
|
# keyboard.json can only exist at the deepest part of the tree
|
|
keyboard_json_count = 0
|
|
for info_file in config_files:
|
|
if info_file.name == 'keyboard.json':
|
|
keyboard_json_count += 1
|
|
if info_file != keyboard_json_path:
|
|
_log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.')
|
|
|
|
# No keyboard.json next to info.json
|
|
for conf_file in config_files:
|
|
if conf_file.name == 'keyboard.json':
|
|
info_file = conf_file.parent / 'info.json'
|
|
if info_file.exists():
|
|
_log_error(info_data, f'Invalid info.json location detected: {info_file}.')
|
|
|
|
# Moving forward keyboard.json should be used as a build target
|
|
if keyboard_json_count == 0:
|
|
_log_warning(info_data, 'Build marker "keyboard.json" not found.')
|
|
|
|
|
|
def _validate_layouts(keyboard, info_data): # noqa C901
|
|
"""Non schema checks
|
|
"""
|
|
col_num = info_data.get('matrix_size', {}).get('cols', 0)
|
|
row_num = info_data.get('matrix_size', {}).get('rows', 0)
|
|
layouts = info_data.get('layouts', {})
|
|
layout_aliases = info_data.get('layout_aliases', {})
|
|
community_layouts = info_data.get('community_layouts', [])
|
|
community_layouts_names = list(map(lambda layout: f'LAYOUT_{layout}', community_layouts))
|
|
|
|
# Make sure we have at least one layout
|
|
if len(layouts) == 0 or all(not layout.get('json_layout', False) for layout in layouts.values()):
|
|
_log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in info.json.')
|
|
|
|
# Make sure all layouts are DD
|
|
for layout_name, layout_data in layouts.items():
|
|
if layout_data.get('c_macro', False):
|
|
_log_error(info_data, f'{layout_name}: Layout macro should not be defined within ".h" files.')
|
|
|
|
# Make sure all matrix values are in bounds
|
|
for layout_name, layout_data in layouts.items():
|
|
for index, key_data in enumerate(layout_data['layout']):
|
|
row, col = key_data['matrix']
|
|
key_name = key_data.get('label', f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}')
|
|
if row >= row_num:
|
|
_log_error(info_data, f'{layout_name}: Matrix row for key {index} ({key_name}) is {row} but must be less than {row_num}')
|
|
if col >= col_num:
|
|
_log_error(info_data, f'{layout_name}: Matrix column for key {index} ({key_name}) is {col} but must be less than {col_num}')
|
|
|
|
# Reject duplicate matrix locations
|
|
for layout_name, layout_data in layouts.items():
|
|
seen = set()
|
|
for index, key_data in enumerate(layout_data['layout']):
|
|
key = f"{key_data['matrix']}"
|
|
if key in seen:
|
|
_log_error(info_data, f'{layout_name}: Matrix location for key {index} is not unique {key_data}')
|
|
seen.add(key)
|
|
|
|
# Warn if physical positions are offset (at least one key should be at x=0, and at least one key at y=0)
|
|
for layout_name, layout_data in layouts.items():
|
|
offset_x = min([_get_key_left_position(k) for k in layout_data['layout']])
|
|
if offset_x > 0:
|
|
_log_warning(info_data, f'Layout "{layout_name}" is offset on X axis by {offset_x}')
|
|
|
|
offset_y = min([k['y'] for k in layout_data['layout']])
|
|
if offset_y > 0:
|
|
_log_warning(info_data, f'Layout "{layout_name}" is offset on Y axis by {offset_y}')
|
|
|
|
# Providing only LAYOUT_all "because I define my layouts in a 3rd party tool"
|
|
if len(layouts) == 1 and 'LAYOUT_all' in layouts:
|
|
_log_warning(info_data, '"LAYOUT_all" should be "LAYOUT" unless additional layouts are provided.')
|
|
|
|
# Extended layout name checks - ignoring community_layouts and "safe" values
|
|
potential_layouts = set(layouts.keys()) - set(community_layouts_names)
|
|
for layout in potential_layouts:
|
|
if _keyboard_in_layout_name(keyboard, layout):
|
|
_log_warning(info_data, f'Layout "{layout}" should not contain name of keyboard.')
|
|
|
|
# Filter out any non-existing community layouts
|
|
for layout in community_layouts:
|
|
if not _valid_community_layout(layout):
|
|
# Ignore layout from future checks
|
|
info_data['community_layouts'].remove(layout)
|
|
_log_error(info_data, 'Claims to support a community layout that does not exist: %s' % (layout))
|
|
|
|
# Make sure we supply layout macros for the community layouts we claim to support
|
|
for layout_name in community_layouts_names:
|
|
if layout_name not in layouts and layout_name not in layout_aliases:
|
|
_log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name))
|
|
|
|
|
|
def _validate_keycodes(keyboard, info_data):
|
|
"""Non schema checks
|
|
"""
|
|
# keycodes with length > 7 must have short forms for visualisation purposes
|
|
for decl in info_data.get('keycodes', []):
|
|
if len(decl["key"]) > 7:
|
|
if not decl.get("aliases", []):
|
|
_log_error(info_data, f'Keycode {decl["key"]} has no short form alias')
|
|
|
|
|
|
def _validate_encoders(keyboard, info_data):
|
|
"""Non schema checks
|
|
"""
|
|
# encoder IDs in layouts must be in range and not duplicated
|
|
found = _find_invalid_encoder_index(info_data)
|
|
for layout_name, encoder_index, reason in found:
|
|
_log_error(info_data, f'Layout "{layout_name}" contains {reason} encoder index {encoder_index}.')
|
|
|
|
|
|
def _validate(keyboard, info_data):
|
|
"""Perform various validation on the provided info.json data
|
|
"""
|
|
# First validate against the jsonschema
|
|
try:
|
|
validate(info_data, 'qmk.api.keyboard.v1')
|
|
|
|
# Additional validation
|
|
_validate_build_target(keyboard, info_data)
|
|
_validate_layouts(keyboard, info_data)
|
|
_validate_keycodes(keyboard, info_data)
|
|
_validate_encoders(keyboard, info_data)
|
|
|
|
except jsonschema.ValidationError as e:
|
|
json_path = '.'.join([str(p) for p in e.absolute_path])
|
|
cli.log.error('Invalid API data: %s: %s: %s', keyboard, json_path, e.message)
|
|
maybe_exit(1)
|
|
|
|
|
|
def info_json(keyboard, force_layout=None):
|
|
"""Generate the info.json data for a specific keyboard.
|
|
"""
|
|
cur_dir = Path('keyboards')
|
|
root_rules_mk = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')
|
|
|
|
if 'DEFAULT_FOLDER' in root_rules_mk:
|
|
keyboard = root_rules_mk['DEFAULT_FOLDER']
|
|
|
|
info_data = {
|
|
'keyboard_name': str(keyboard),
|
|
'keyboard_folder': str(keyboard),
|
|
'keymaps': {},
|
|
'layouts': {},
|
|
'parse_errors': [],
|
|
'parse_warnings': [],
|
|
'maintainer': 'qmk',
|
|
}
|
|
|
|
# Populate layout data
|
|
layouts, aliases = _search_keyboard_h(keyboard)
|
|
|
|
if aliases:
|
|
info_data['layout_aliases'] = aliases
|
|
|
|
for layout_name, layout_json in layouts.items():
|
|
if not layout_name.startswith('LAYOUT_kc'):
|
|
layout_json['c_macro'] = True
|
|
layout_json['json_layout'] = False
|
|
info_data['layouts'][layout_name] = layout_json
|
|
|
|
# Merge in the data from info.json, config.h, and rules.mk
|
|
info_data = merge_info_jsons(keyboard, info_data)
|
|
info_data = _process_defaults(info_data)
|
|
info_data = _extract_rules_mk(info_data, rules_mk(str(keyboard)))
|
|
info_data = _extract_config_h(info_data, config_h(str(keyboard)))
|
|
|
|
# Ensure that we have various calculated values
|
|
info_data = _matrix_size(info_data)
|
|
info_data = _joystick_axis_count(info_data)
|
|
|
|
# Merge in data from <keyboard.c>
|
|
info_data = _extract_led_config(info_data, str(keyboard))
|
|
|
|
# Force a community layout if requested
|
|
community_layouts = info_data.get("community_layouts", [])
|
|
if force_layout in community_layouts:
|
|
info_data["community_layouts"] = [force_layout]
|
|
|
|
# Validate
|
|
# Skip processing if necessary
|
|
if not truthy(os.environ.get('SKIP_SCHEMA_VALIDATION'), False):
|
|
_validate(keyboard, info_data)
|
|
|
|
# Check that the reported matrix size is consistent with the actual matrix size
|
|
_check_matrix(info_data)
|
|
|
|
return info_data
|
|
|
|
|
|
def _extract_features(info_data, rules):
|
|
"""Find all the features enabled in rules.mk.
|
|
"""
|
|
# Process booleans rules
|
|
for key, value in rules.items():
|
|
if key.endswith('_ENABLE'):
|
|
key = '_'.join(key.split('_')[:-1]).lower()
|
|
value = True if value.lower() in true_values else False if value.lower() in false_values else value
|
|
|
|
if key in ['lto']:
|
|
continue
|
|
|
|
if 'config_h_features' not in info_data:
|
|
info_data['config_h_features'] = {}
|
|
|
|
if 'features' not in info_data:
|
|
info_data['features'] = {}
|
|
|
|
if key in info_data['features']:
|
|
_log_warning(info_data, 'Feature %s is specified in both info.json (%s) and rules.mk (%s). The rules.mk value wins.' % (key, info_data['features'], value))
|
|
|
|
info_data['features'][key] = value
|
|
info_data['config_h_features'][key] = value
|
|
|
|
return info_data
|
|
|
|
|
|
def _pin_name(pin):
|
|
"""Returns the proper representation for a pin.
|
|
"""
|
|
pin = pin.strip()
|
|
|
|
if not pin:
|
|
return None
|
|
|
|
elif pin.isdigit():
|
|
return int(pin)
|
|
|
|
elif pin == 'NO_PIN':
|
|
return None
|
|
|
|
return pin
|
|
|
|
|
|
def _extract_pins(pins):
|
|
"""Returns a list of pins from a comma separated string of pins.
|
|
"""
|
|
return [_pin_name(pin) for pin in pins.split(',')]
|
|
|
|
|
|
def _extract_2d_array(raw):
|
|
"""Return a 2d array of strings
|
|
"""
|
|
out_array = []
|
|
|
|
while raw[-1] != '}':
|
|
raw = raw[:-1]
|
|
|
|
for row in raw.split('},{'):
|
|
if row.startswith('{'):
|
|
row = row[1:]
|
|
|
|
if row.endswith('}'):
|
|
row = row[:-1]
|
|
|
|
out_array.append([])
|
|
|
|
for val in row.split(','):
|
|
out_array[-1].append(val)
|
|
|
|
return out_array
|
|
|
|
|
|
def _extract_2d_int_array(raw):
|
|
"""Return a 2d array of ints
|
|
"""
|
|
ret = _extract_2d_array(raw)
|
|
|
|
return [list(map(int, x)) for x in ret]
|
|
|
|
|
|
def _extract_direct_matrix(direct_pins):
|
|
"""extract direct_matrix
|
|
"""
|
|
direct_pin_array = _extract_2d_array(direct_pins)
|
|
|
|
for i in range(len(direct_pin_array)):
|
|
for j in range(len(direct_pin_array[i])):
|
|
if direct_pin_array[i][j] == 'NO_PIN':
|
|
direct_pin_array[i][j] = None
|
|
|
|
return direct_pin_array
|
|
|
|
|
|
def _extract_audio(info_data, config_c):
|
|
"""Populate data about the audio configuration
|
|
"""
|
|
audio_pins = []
|
|
|
|
for pin in 'B5', 'B6', 'B7', 'C4', 'C5', 'C6':
|
|
if config_c.get(f'{pin}_AUDIO'):
|
|
audio_pins.append(pin)
|
|
|
|
if audio_pins:
|
|
info_data['audio'] = {'pins': audio_pins}
|
|
|
|
|
|
def _extract_encoders_values(config_c, postfix=''):
|
|
"""Common encoder extraction logic
|
|
"""
|
|
a_pad = config_c.get(f'ENCODER_A_PINS{postfix}', '').replace(' ', '')[1:-1]
|
|
b_pad = config_c.get(f'ENCODER_B_PINS{postfix}', '').replace(' ', '')[1:-1]
|
|
resolutions = config_c.get(f'ENCODER_RESOLUTIONS{postfix}', '').replace(' ', '')[1:-1]
|
|
|
|
default_resolution = config_c.get('ENCODER_RESOLUTION', None)
|
|
|
|
if a_pad and b_pad:
|
|
a_pad = list(filter(None, a_pad.split(',')))
|
|
b_pad = list(filter(None, b_pad.split(',')))
|
|
resolutions = list(filter(None, resolutions.split(',')))
|
|
if default_resolution:
|
|
resolutions += [default_resolution] * (len(a_pad) - len(resolutions))
|
|
|
|
encoders = []
|
|
for index in range(len(a_pad)):
|
|
encoder = {'pin_a': a_pad[index], 'pin_b': b_pad[index]}
|
|
if index < len(resolutions):
|
|
encoder['resolution'] = int(resolutions[index])
|
|
encoders.append(encoder)
|
|
|
|
return encoders
|
|
|
|
|
|
def _extract_encoders(info_data, config_c):
|
|
"""Populate data about encoder pins
|
|
"""
|
|
encoders = _extract_encoders_values(config_c)
|
|
if encoders:
|
|
if 'encoder' not in info_data:
|
|
info_data['encoder'] = {}
|
|
|
|
if 'rotary' in info_data['encoder']:
|
|
_log_warning(info_data, 'Encoder config is specified in both config.h (%s) and info.json (%s). The config.h value wins.' % (encoders, info_data['encoder']['rotary']))
|
|
|
|
info_data['encoder']['rotary'] = encoders
|
|
|
|
# TODO: some logic still assumes ENCODER_ENABLED would partially create encoder dict
|
|
if info_data.get('features', {}).get('encoder', False):
|
|
if 'encoder' not in info_data:
|
|
info_data['encoder'] = {}
|
|
info_data['encoder']['enabled'] = True
|
|
|
|
|
|
def _extract_split_encoders(info_data, config_c):
|
|
"""Populate data about split encoder pins
|
|
"""
|
|
encoders = _extract_encoders_values(config_c, '_RIGHT')
|
|
if encoders:
|
|
if 'split' not in info_data:
|
|
info_data['split'] = {}
|
|
|
|
if 'encoder' not in info_data['split']:
|
|
info_data['split']['encoder'] = {}
|
|
|
|
if 'right' not in info_data['split']['encoder']:
|
|
info_data['split']['encoder']['right'] = {}
|
|
|
|
if 'rotary' in info_data['split']['encoder']['right']:
|
|
_log_warning(info_data, 'Encoder config is specified in both config.h and info.json (encoder.rotary) (Value: %s), the config.h value wins.' % info_data['split']['encoder']['right']['rotary'])
|
|
|
|
info_data['split']['encoder']['right']['rotary'] = encoders
|
|
|
|
|
|
def _extract_secure_unlock(info_data, config_c):
|
|
"""Populate data about the secure unlock sequence
|
|
"""
|
|
unlock = config_c.get('SECURE_UNLOCK_SEQUENCE', '').replace(' ', '')[1:-1]
|
|
if unlock:
|
|
unlock_array = _extract_2d_int_array(unlock)
|
|
if 'secure' not in info_data:
|
|
info_data['secure'] = {}
|
|
|
|
if 'unlock_sequence' in info_data['secure']:
|
|
_log_warning(info_data, 'Secure unlock sequence is specified in both config.h (SECURE_UNLOCK_SEQUENCE) and info.json (secure.unlock_sequence) (Value: %s), the config.h value wins.' % info_data['secure']['unlock_sequence'])
|
|
|
|
info_data['secure']['unlock_sequence'] = unlock_array
|
|
|
|
|
|
def _extract_split_handedness(info_data, config_c):
|
|
# Migrate
|
|
split = info_data.get('split', {})
|
|
if 'matrix_grid' in split:
|
|
split['handedness'] = split.get('handedness', {})
|
|
split['handedness']['matrix_grid'] = split.pop('matrix_grid')
|
|
|
|
|
|
def _extract_split_serial(info_data, config_c):
|
|
# Migrate
|
|
split = info_data.get('split', {})
|
|
if 'soft_serial_pin' in split:
|
|
split['serial'] = split.get('serial', {})
|
|
split['serial']['pin'] = split.pop('soft_serial_pin')
|
|
|
|
|
|
def _extract_split_transport(info_data, config_c):
|
|
# Figure out the transport method
|
|
if config_c.get('USE_I2C') is True:
|
|
if 'split' not in info_data:
|
|
info_data['split'] = {}
|
|
|
|
if 'transport' not in info_data['split']:
|
|
info_data['split']['transport'] = {}
|
|
|
|
if 'protocol' in info_data['split']['transport']:
|
|
_log_warning(info_data, 'Split transport is specified in both config.h (USE_I2C) and info.json (split.transport.protocol) (Value: %s), the config.h value wins.' % info_data['split']['transport'])
|
|
|
|
info_data['split']['transport']['protocol'] = 'i2c'
|
|
|
|
# Ignore transport defaults if "SPLIT_KEYBOARD" is unset
|
|
elif 'enabled' in info_data.get('split', {}):
|
|
if 'split' not in info_data:
|
|
info_data['split'] = {}
|
|
|
|
if 'transport' not in info_data['split']:
|
|
info_data['split']['transport'] = {}
|
|
|
|
if 'protocol' not in info_data['split']['transport']:
|
|
info_data['split']['transport']['protocol'] = 'serial'
|
|
|
|
# Migrate
|
|
transport = info_data.get('split', {}).get('transport', {})
|
|
if 'sync_matrix_state' in transport:
|
|
transport['sync'] = transport.get('sync', {})
|
|
transport['sync']['matrix_state'] = transport.pop('sync_matrix_state')
|
|
if 'sync_modifiers' in transport:
|
|
transport['sync'] = transport.get('sync', {})
|
|
transport['sync']['modifiers'] = transport.pop('sync_modifiers')
|
|
|
|
|
|
def _extract_split_right_pins(info_data, config_c):
|
|
# Figure out the right half matrix pins
|
|
row_pins = config_c.get('MATRIX_ROW_PINS_RIGHT', '').replace('{', '').replace('}', '').strip()
|
|
col_pins = config_c.get('MATRIX_COL_PINS_RIGHT', '').replace('{', '').replace('}', '').strip()
|
|
direct_pins = config_c.get('DIRECT_PINS_RIGHT', '').replace(' ', '')[1:-1]
|
|
|
|
if row_pins or col_pins or direct_pins:
|
|
if info_data.get('split', {}).get('matrix_pins', {}).get('right', None):
|
|
_log_warning(info_data, 'Right hand matrix data is specified in both info.json and config.h, the config.h values win.')
|
|
|
|
if 'split' not in info_data:
|
|
info_data['split'] = {}
|
|
|
|
if 'matrix_pins' not in info_data['split']:
|
|
info_data['split']['matrix_pins'] = {}
|
|
|
|
if 'right' not in info_data['split']['matrix_pins']:
|
|
info_data['split']['matrix_pins']['right'] = {}
|
|
|
|
if col_pins:
|
|
info_data['split']['matrix_pins']['right']['cols'] = _extract_pins(col_pins)
|
|
|
|
if row_pins:
|
|
info_data['split']['matrix_pins']['right']['rows'] = _extract_pins(row_pins)
|
|
|
|
if direct_pins:
|
|
info_data['split']['matrix_pins']['right']['direct'] = _extract_direct_matrix(direct_pins)
|
|
|
|
|
|
def _extract_matrix_info(info_data, config_c):
|
|
"""Populate the matrix information.
|
|
"""
|
|
row_pins = config_c.get('MATRIX_ROW_PINS', '').replace('{', '').replace('}', '').strip()
|
|
col_pins = config_c.get('MATRIX_COL_PINS', '').replace('{', '').replace('}', '').strip()
|
|
direct_pins = config_c.get('DIRECT_PINS', '').replace(' ', '')[1:-1]
|
|
info_snippet = {}
|
|
|
|
if 'MATRIX_ROWS' in config_c and 'MATRIX_COLS' in config_c:
|
|
if 'matrix_size' in info_data:
|
|
_log_warning(info_data, 'Matrix size is specified in both info.json and config.h, the config.h values win.')
|
|
|
|
info_data['matrix_size'] = {
|
|
'cols': compute(config_c.get('MATRIX_COLS', '0')),
|
|
'rows': compute(config_c.get('MATRIX_ROWS', '0')),
|
|
}
|
|
|
|
if row_pins and col_pins:
|
|
if 'matrix_pins' in info_data and 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']:
|
|
_log_warning(info_data, 'Matrix pins are specified in both info.json and config.h, the config.h values win.')
|
|
|
|
info_snippet['cols'] = _extract_pins(col_pins)
|
|
info_snippet['rows'] = _extract_pins(row_pins)
|
|
|
|
if direct_pins:
|
|
if 'matrix_pins' in info_data and 'direct' in info_data['matrix_pins']:
|
|
_log_warning(info_data, 'Direct pins are specified in both info.json and config.h, the config.h values win.')
|
|
|
|
info_snippet['direct'] = _extract_direct_matrix(direct_pins)
|
|
|
|
if config_c.get('CUSTOM_MATRIX', 'no') != 'no':
|
|
if 'matrix_pins' in info_data and 'custom' in info_data['matrix_pins']:
|
|
_log_warning(info_data, 'Custom Matrix is specified in both info.json and config.h, the config.h values win.')
|
|
|
|
info_snippet['custom'] = True
|
|
|
|
if config_c['CUSTOM_MATRIX'] == 'lite':
|
|
info_snippet['custom_lite'] = True
|
|
|
|
if info_snippet:
|
|
info_data['matrix_pins'] = info_snippet
|
|
|
|
return info_data
|
|
|
|
|
|
def _config_to_json(key_type, config_value):
|
|
"""Convert config value using spec
|
|
"""
|
|
if key_type.startswith('array'):
|
|
if key_type.count('.') > 1:
|
|
raise Exception(f"Conversion of {key_type} not possible")
|
|
|
|
if '.' in key_type:
|
|
key_type, array_type = key_type.split('.', 1)
|
|
else:
|
|
array_type = None
|
|
|
|
config_value = config_value.replace('{', '').replace('}', '').strip()
|
|
|
|
if array_type == 'int':
|
|
return list(map(int, config_value.split(',')))
|
|
else:
|
|
return list(map(str.strip, config_value.split(',')))
|
|
|
|
elif key_type in ['bool', 'flag']:
|
|
if isinstance(config_value, bool):
|
|
return config_value
|
|
return config_value in true_values
|
|
|
|
elif key_type == 'hex':
|
|
return '0x' + config_value[2:].upper()
|
|
|
|
elif key_type == 'list':
|
|
return config_value.split()
|
|
|
|
elif key_type == 'int':
|
|
return int(config_value)
|
|
|
|
elif key_type == 'str':
|
|
return config_value.strip('"').replace('\\"', '"').replace('\\\\', '\\')
|
|
|
|
elif key_type == 'bcd_version':
|
|
major = int(config_value[2:4])
|
|
minor = int(config_value[4])
|
|
revision = int(config_value[5])
|
|
|
|
return f'{major}.{minor}.{revision}'
|
|
|
|
return config_value
|
|
|
|
|
|
def _extract_config_h(info_data, config_c):
|
|
"""Pull some keyboard information from existing config.h files
|
|
"""
|
|
# Pull in data from the json map
|
|
dotty_info = dotty(info_data)
|
|
info_config_map = json_load(Path('data/mappings/info_config.hjson'))
|
|
|
|
for config_key, info_dict in info_config_map.items():
|
|
info_key = info_dict['info_key']
|
|
key_type = info_dict.get('value_type', 'raw')
|
|
|
|
try:
|
|
replace_with = info_dict.get('replace_with')
|
|
if config_key in config_c and info_dict.get('invalid', False):
|
|
if replace_with:
|
|
_log_error(info_data, '%s in config.h is no longer a valid option and should be replaced with %s' % (config_key, replace_with))
|
|
else:
|
|
_log_error(info_data, '%s in config.h is no longer a valid option and should be removed' % config_key)
|
|
elif config_key in config_c and info_dict.get('deprecated', False):
|
|
if replace_with:
|
|
_log_warning(info_data, '%s in config.h is deprecated in favor of %s and will be removed at a later date' % (config_key, replace_with))
|
|
else:
|
|
_log_warning(info_data, '%s in config.h is deprecated and will be removed at a later date' % config_key)
|
|
|
|
if config_key in config_c and info_dict.get('to_json', True):
|
|
if dotty_info.get(info_key) and info_dict.get('warn_duplicate', True):
|
|
_log_warning(info_data, '%s in config.h is overwriting %s in info.json' % (config_key, info_key))
|
|
|
|
dotty_info[info_key] = _config_to_json(key_type, config_c[config_key])
|
|
|
|
except Exception as e:
|
|
_log_warning(info_data, f'{config_key}->{info_key}: {e}')
|
|
|
|
info_data.update(dotty_info)
|
|
|
|
# Pull data that easily can't be mapped in json
|
|
_extract_matrix_info(info_data, config_c)
|
|
_extract_audio(info_data, config_c)
|
|
_extract_secure_unlock(info_data, config_c)
|
|
_extract_split_handedness(info_data, config_c)
|
|
_extract_split_serial(info_data, config_c)
|
|
_extract_split_transport(info_data, config_c)
|
|
_extract_split_right_pins(info_data, config_c)
|
|
_extract_encoders(info_data, config_c)
|
|
_extract_split_encoders(info_data, config_c)
|
|
|
|
return info_data
|
|
|
|
|
|
def _process_defaults(info_data):
|
|
"""Process any additional defaults based on currently discovered information
|
|
"""
|
|
defaults_map = json_load(Path('data/mappings/defaults.hjson'))
|
|
for default_type in defaults_map.keys():
|
|
thing_map = defaults_map[default_type]
|
|
if default_type in info_data:
|
|
merged_count = 0
|
|
thing_items = thing_map.get(info_data[default_type], {}).items()
|
|
for key, value in thing_items:
|
|
if key not in info_data:
|
|
info_data[key] = value
|
|
merged_count += 1
|
|
|
|
if merged_count == 0 and len(thing_items) > 0:
|
|
_log_warning(info_data, 'All defaults for \'%s\' were skipped, potential redundant config or misconfiguration detected' % (default_type))
|
|
|
|
return info_data
|
|
|
|
|
|
def _extract_rules_mk(info_data, rules):
|
|
"""Pull some keyboard information from existing rules.mk files
|
|
"""
|
|
info_data['processor'] = rules.get('MCU', info_data.get('processor', 'atmega32u4'))
|
|
|
|
if info_data['processor'] in CHIBIOS_PROCESSORS:
|
|
arm_processor_rules(info_data, rules)
|
|
|
|
elif info_data['processor'] in LUFA_PROCESSORS + VUSB_PROCESSORS:
|
|
avr_processor_rules(info_data, rules)
|
|
|
|
else:
|
|
cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], info_data['processor']))
|
|
unknown_processor_rules(info_data, rules)
|
|
|
|
# Pull in data from the json map
|
|
dotty_info = dotty(info_data)
|
|
info_rules_map = json_load(Path('data/mappings/info_rules.hjson'))
|
|
|
|
for rules_key, info_dict in info_rules_map.items():
|
|
info_key = info_dict['info_key']
|
|
key_type = info_dict.get('value_type', 'raw')
|
|
|
|
try:
|
|
replace_with = info_dict.get('replace_with')
|
|
if rules_key in rules and info_dict.get('invalid', False):
|
|
if replace_with:
|
|
_log_error(info_data, '%s in rules.mk is no longer a valid option and should be replaced with %s' % (rules_key, replace_with))
|
|
else:
|
|
_log_error(info_data, '%s in rules.mk is no longer a valid option and should be removed' % rules_key)
|
|
elif rules_key in rules and info_dict.get('deprecated', False):
|
|
if replace_with:
|
|
_log_warning(info_data, '%s in rules.mk is deprecated in favor of %s and will be removed at a later date' % (rules_key, replace_with))
|
|
else:
|
|
_log_warning(info_data, '%s in rules.mk is deprecated and will be removed at a later date' % rules_key)
|
|
|
|
if rules_key in rules and info_dict.get('to_json', True):
|
|
if dotty_info.get(info_key) and info_dict.get('warn_duplicate', True):
|
|
_log_warning(info_data, '%s in rules.mk is overwriting %s in info.json' % (rules_key, info_key))
|
|
|
|
dotty_info[info_key] = _config_to_json(key_type, rules[rules_key])
|
|
|
|
except Exception as e:
|
|
_log_warning(info_data, f'{rules_key}->{info_key}: {e}')
|
|
|
|
info_data.update(dotty_info)
|
|
|
|
# Merge in config values that can't be easily mapped
|
|
_extract_features(info_data, rules)
|
|
|
|
return info_data
|
|
|
|
|
|
def find_keyboard_c(keyboard):
|
|
"""Find all <keyboard>.c files
|
|
"""
|
|
keyboard = Path(keyboard)
|
|
current_path = Path('keyboards/')
|
|
|
|
files = []
|
|
for directory in keyboard.parts:
|
|
current_path = current_path / directory
|
|
keyboard_c_path = current_path / f'{directory}.c'
|
|
if keyboard_c_path.exists():
|
|
files.append(keyboard_c_path)
|
|
|
|
return files
|
|
|
|
|
|
def _extract_led_config(info_data, keyboard):
|
|
"""Scan all <keyboard>.c files for led config
|
|
"""
|
|
for feature in ['rgb_matrix', 'led_matrix']:
|
|
if info_data.get('features', {}).get(feature, False) or feature in info_data:
|
|
# Only attempt search if dd led config is missing
|
|
if 'layout' not in info_data.get(feature, {}):
|
|
cols = info_data.get('matrix_size', {}).get('cols')
|
|
rows = info_data.get('matrix_size', {}).get('rows')
|
|
if cols and rows:
|
|
# Process
|
|
for file in find_keyboard_c(keyboard):
|
|
try:
|
|
ret = find_led_config(file, cols, rows)
|
|
if ret:
|
|
info_data[feature] = info_data.get(feature, {})
|
|
info_data[feature]['layout'] = ret
|
|
except Exception as e:
|
|
_log_warning(info_data, f'led_config: {file.name}: {e}')
|
|
else:
|
|
_log_warning(info_data, 'led_config: matrix size required to parse g_led_config')
|
|
|
|
if info_data[feature].get('layout', None) and not info_data[feature].get('led_count', None):
|
|
info_data[feature]['led_count'] = len(info_data[feature]['layout'])
|
|
|
|
return info_data
|
|
|
|
|
|
def _matrix_size(info_data):
|
|
"""Add info_data['matrix_size'] if it doesn't exist.
|
|
"""
|
|
if 'matrix_size' not in info_data and 'matrix_pins' in info_data:
|
|
info_data['matrix_size'] = {}
|
|
|
|
if 'direct' in info_data['matrix_pins']:
|
|
info_data['matrix_size']['cols'] = len(info_data['matrix_pins']['direct'][0])
|
|
info_data['matrix_size']['rows'] = len(info_data['matrix_pins']['direct'])
|
|
elif 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']:
|
|
info_data['matrix_size']['cols'] = len(info_data['matrix_pins']['cols'])
|
|
info_data['matrix_size']['rows'] = len(info_data['matrix_pins']['rows'])
|
|
|
|
# Assumption of split common
|
|
if 'split' in info_data:
|
|
if info_data['split'].get('enabled', False):
|
|
info_data['matrix_size']['rows'] *= 2
|
|
|
|
return info_data
|
|
|
|
|
|
def _joystick_axis_count(info_data):
|
|
"""Add info_data['joystick.axis_count'] if required
|
|
"""
|
|
if 'axes' in info_data.get('joystick', {}):
|
|
axes_keys = info_data['joystick']['axes'].keys()
|
|
info_data['joystick']['axis_count'] = max(JOYSTICK_AXES.index(a) for a in axes_keys) + 1 if axes_keys else 0
|
|
|
|
return info_data
|
|
|
|
|
|
def _check_matrix(info_data):
|
|
"""Check the matrix to ensure that row/column count is consistent.
|
|
"""
|
|
if 'matrix_pins' in info_data and 'matrix_size' in info_data:
|
|
actual_col_count = info_data['matrix_size'].get('cols', 0)
|
|
actual_row_count = info_data['matrix_size'].get('rows', 0)
|
|
col_count = row_count = 0
|
|
|
|
if 'direct' in info_data['matrix_pins']:
|
|
col_count = len(info_data['matrix_pins']['direct'][0])
|
|
row_count = len(info_data['matrix_pins']['direct'])
|
|
elif 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']:
|
|
col_count = len(info_data['matrix_pins']['cols'])
|
|
row_count = len(info_data['matrix_pins']['rows'])
|
|
elif 'cols' not in info_data['matrix_pins'] and 'rows' not in info_data['matrix_pins']:
|
|
# This case caters for custom matrix implementations where normal rows/cols are specified
|
|
return
|
|
|
|
if col_count != actual_col_count and col_count != (actual_col_count / 2):
|
|
# FIXME: once we can we should detect if split is enabled to do the actual_col_count/2 check.
|
|
_log_error(info_data, f'MATRIX_COLS is inconsistent with the size of MATRIX_COL_PINS: {col_count} != {actual_col_count}')
|
|
|
|
if row_count != actual_row_count and row_count != (actual_row_count / 2):
|
|
# FIXME: once we can we should detect if split is enabled to do the actual_row_count/2 check.
|
|
_log_error(info_data, f'MATRIX_ROWS is inconsistent with the size of MATRIX_ROW_PINS: {row_count} != {actual_row_count}')
|
|
|
|
|
|
def _search_keyboard_h(keyboard):
|
|
keyboard = Path(keyboard)
|
|
current_path = Path('keyboards/')
|
|
aliases = {}
|
|
layouts = {}
|
|
|
|
for directory in keyboard.parts:
|
|
current_path = current_path / directory
|
|
keyboard_h = '%s.h' % (directory,)
|
|
keyboard_h_path = current_path / keyboard_h
|
|
if keyboard_h_path.exists():
|
|
new_layouts, new_aliases = find_layouts(keyboard_h_path)
|
|
layouts.update(new_layouts)
|
|
|
|
for alias, alias_text in new_aliases.items():
|
|
if alias_text in layouts:
|
|
aliases[alias] = alias_text
|
|
|
|
return layouts, aliases
|
|
|
|
|
|
def _log_error(info_data, message):
|
|
"""Send an error message to both JSON and the log.
|
|
"""
|
|
info_data['parse_errors'].append(message)
|
|
cli.log.error('%s: %s', info_data.get('keyboard_folder', 'Unknown Keyboard!'), message)
|
|
|
|
|
|
def _log_warning(info_data, message):
|
|
"""Send a warning message to both JSON and the log.
|
|
"""
|
|
info_data['parse_warnings'].append(message)
|
|
cli.log.warning('%s: %s', info_data.get('keyboard_folder', 'Unknown Keyboard!'), message)
|
|
|
|
|
|
def arm_processor_rules(info_data, rules):
|
|
"""Setup the default info for an ARM board.
|
|
"""
|
|
info_data['processor_type'] = 'arm'
|
|
info_data['protocol'] = 'ChibiOS'
|
|
info_data['platform_key'] = 'chibios'
|
|
|
|
if 'STM32' in info_data['processor']:
|
|
info_data['platform'] = 'STM32'
|
|
elif 'MCU_SERIES' in rules:
|
|
info_data['platform'] = rules['MCU_SERIES']
|
|
|
|
return info_data
|
|
|
|
|
|
def avr_processor_rules(info_data, rules):
|
|
"""Setup the default info for an AVR board.
|
|
"""
|
|
info_data['processor_type'] = 'avr'
|
|
info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown'
|
|
info_data['platform_key'] = 'avr'
|
|
info_data['protocol'] = 'V-USB' if info_data['processor'] in VUSB_PROCESSORS else 'LUFA'
|
|
|
|
# FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk:
|
|
# info_data['protocol'] = 'V-USB' if rules.get('PROTOCOL') == 'VUSB' else 'LUFA'
|
|
|
|
return info_data
|
|
|
|
|
|
def unknown_processor_rules(info_data, rules):
|
|
"""Setup the default keyboard info for unknown boards.
|
|
"""
|
|
info_data['bootloader'] = 'unknown'
|
|
info_data['platform'] = 'unknown'
|
|
info_data['processor'] = 'unknown'
|
|
info_data['processor_type'] = 'unknown'
|
|
info_data['protocol'] = 'unknown'
|
|
|
|
return info_data
|
|
|
|
|
|
def merge_info_jsons(keyboard, info_data):
|
|
"""Return a merged copy of all the info.json files for a keyboard.
|
|
"""
|
|
config_files = find_info_json(keyboard)
|
|
|
|
for info_file in config_files:
|
|
# Load and validate the JSON data
|
|
new_info_data = json_load(info_file)
|
|
|
|
if not isinstance(new_info_data, dict):
|
|
_log_error(info_data, "Invalid file %s, root object should be a dictionary." % (str(info_file),))
|
|
continue
|
|
|
|
if not truthy(os.environ.get('SKIP_SCHEMA_VALIDATION'), False):
|
|
try:
|
|
validate(new_info_data, 'qmk.keyboard.v1')
|
|
except jsonschema.ValidationError as e:
|
|
json_path = '.'.join([str(p) for p in e.absolute_path])
|
|
cli.log.error('Not including data from file: %s', info_file)
|
|
cli.log.error('\t%s: %s', json_path, e.message)
|
|
continue
|
|
|
|
# Merge layout data in
|
|
if 'layout_aliases' in new_info_data:
|
|
info_data['layout_aliases'] = {**info_data.get('layout_aliases', {}), **new_info_data['layout_aliases']}
|
|
del new_info_data['layout_aliases']
|
|
|
|
for layout_name, layout in new_info_data.get('layouts', {}).items():
|
|
if layout_name in info_data.get('layout_aliases', {}):
|
|
_log_warning(info_data, f"info.json uses alias name {layout_name} instead of {info_data['layout_aliases'][layout_name]}")
|
|
layout_name = info_data['layout_aliases'][layout_name]
|
|
|
|
if layout_name in info_data['layouts']:
|
|
if len(info_data['layouts'][layout_name]['layout']) != len(layout['layout']):
|
|
msg = 'Number of keys for %s does not match! info.json specifies %d keys, C macro specifies %d'
|
|
_log_error(info_data, msg % (layout_name, len(layout['layout']), len(info_data['layouts'][layout_name]['layout'])))
|
|
else:
|
|
info_data['layouts'][layout_name]['json_layout'] = True
|
|
for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']):
|
|
existing_key.update(new_key)
|
|
else:
|
|
if not all('matrix' in key_data.keys() for key_data in layout['layout']):
|
|
_log_error(info_data, f'Layout "{layout_name}" has no "matrix" definition in either "info.json" or "<keyboard>.h"!')
|
|
else:
|
|
layout['c_macro'] = False
|
|
layout['json_layout'] = True
|
|
info_data['layouts'][layout_name] = layout
|
|
|
|
# Update info_data with the new data
|
|
if 'layouts' in new_info_data:
|
|
del new_info_data['layouts']
|
|
|
|
deep_update(info_data, new_info_data)
|
|
|
|
return info_data
|
|
|
|
|
|
def find_info_json(keyboard):
|
|
"""Finds all the info.json files associated with a keyboard.
|
|
"""
|
|
# Find the most specific first
|
|
base_path = Path('keyboards')
|
|
keyboard_path = base_path / keyboard
|
|
keyboard_parent = keyboard_path.parent
|
|
info_jsons = [keyboard_path / 'info.json', keyboard_path / 'keyboard.json']
|
|
|
|
# Add DEFAULT_FOLDER before parents, if present
|
|
rules = rules_mk(keyboard)
|
|
if 'DEFAULT_FOLDER' in rules:
|
|
info_jsons.append(Path(rules['DEFAULT_FOLDER']) / 'info.json')
|
|
|
|
# Add in parent folders for least specific
|
|
for _ in range(5):
|
|
if keyboard_parent == base_path:
|
|
break
|
|
info_jsons.append(keyboard_parent / 'info.json')
|
|
info_jsons.append(keyboard_parent / 'keyboard.json')
|
|
keyboard_parent = keyboard_parent.parent
|
|
|
|
# Return a list of the info.json files that actually exist
|
|
return [info_json for info_json in info_jsons if info_json.exists()]
|
|
|
|
|
|
def keymap_json_config(keyboard, keymap, force_layout=None):
|
|
"""Extract keymap level config
|
|
"""
|
|
# TODO: resolve keymap.py and info.py circular dependencies
|
|
from qmk.keymap import locate_keymap
|
|
|
|
keymap_folder = locate_keymap(keyboard, keymap, force_layout=force_layout).parent
|
|
|
|
km_info_json = parse_configurator_json(keymap_folder / 'keymap.json')
|
|
return km_info_json.get('config', {})
|
|
|
|
|
|
def keymap_json(keyboard, keymap, force_layout=None):
|
|
"""Generate the info.json data for a specific keymap.
|
|
"""
|
|
# TODO: resolve keymap.py and info.py circular dependencies
|
|
from qmk.keymap import locate_keymap
|
|
|
|
keymap_folder = locate_keymap(keyboard, keymap, force_layout=force_layout).parent
|
|
|
|
# Files to scan
|
|
keymap_config = keymap_folder / 'config.h'
|
|
keymap_rules = keymap_folder / 'rules.mk'
|
|
keymap_file = keymap_folder / 'keymap.json'
|
|
|
|
# Build the info.json file
|
|
kb_info_json = info_json(keyboard, force_layout=force_layout)
|
|
|
|
# Merge in the data from keymap.json
|
|
km_info_json = keymap_json_config(keyboard, keymap, force_layout=force_layout) if keymap_file.exists() else {}
|
|
deep_update(kb_info_json, km_info_json)
|
|
|
|
# Merge in the data from config.h, and rules.mk
|
|
_extract_rules_mk(kb_info_json, parse_rules_mk_file(keymap_rules))
|
|
_extract_config_h(kb_info_json, parse_config_h_file(keymap_config))
|
|
|
|
return kb_info_json
|
|
|
|
|
|
def get_modules(keyboard, keymap_filename):
|
|
"""Get the modules for a keyboard/keymap.
|
|
"""
|
|
modules = []
|
|
|
|
kb_info_json = info_json(keyboard)
|
|
modules.extend(kb_info_json.get('modules', []))
|
|
|
|
if keymap_filename:
|
|
keymap_json = parse_configurator_json(keymap_filename)
|
|
|
|
if keymap_json:
|
|
modules.extend(keymap_json.get('modules', []))
|
|
|
|
return list(dict.fromkeys(modules)) # remove dupes
|