merge QMK 0.18.6 (2022-09-10) #55
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* SPLIT_USB_DETECT added. * lednotg keymap added. * lednotg missing modification fixed. * VERSION is available. * USER00 is used instead of SAFE_RANGE in via/keymap.c
* add BAMFK-4
qmk#16085) * [Keymap] adding new user (p4yne) layout with complex lighting features (per layer, per key, per type) and usefull layers DE/US, etc. Co-authored-by: Drashna Jaelre <[email protected]>
* add mechlovin foundation keyboard Co-authored-by: Drashna Jaelre <[email protected]>
* Add Atreyu keyboard. Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]>
…_lithuanian_qwerty.h (qmk#18028)
Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: peepeetee <[email protected]> Co-authored-by: James Young <[email protected]>
Co-authored-by: Joy <[email protected]>
Co-authored-by: Joy <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Sergey Vlasov <[email protected]> Co-authored-by: yiancar <[email protected]>
* [doc] Update 'Process Record' according to the code * [doc] fix link
* dyz60_hs: add matrix diagram * add LAYOUT_60_ansi * add LAYOUT_60_ansi_split_bs_rshift * add LAYOUT_60_tsangan_hhkb * add LAYOUT_60_iso * add LAYOUT_60_iso_split_bs_rshift * enable Community Layouts support * readme.md: correct keyboard references Replace `dyz60` with `dyz60_hs` as needed.
* Fix compilation error for GH60 satan HHKB 7u layout * Update keyboards/gh60/satan/info.json Co-authored-by: Joel Challis <[email protected]> Co-authored-by: Joel Challis <[email protected]>
* eu_isolation.h: physically arrange layout macros Whitespace only; no logic changes. * info.json: apply friendly formatting Add line breaks between physical rows. * info.json: correct key sequence
* info.json: apply friendly formatting * add LAYOUT_65_ansi_blocker * add LAYOUT_65_ansi_blocker_split_bs * add LAYOUT_65_iso_blocker * add LAYOUT_65_iso_blocker_split_bs * enable Community Layouts support * info.json: correct maintainer value
* Discourage use of ENCODER_MAP at keyboard level * Update docs/feature_encoders.md Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan <[email protected]>
* info.json: correct JSON syntax; friendly formatting * info.json: fix key sequence
…mk#18295) This makes more keys function as printed on the actual keyboard :)
* Update RGB matrix max brightness * Remove old VIA workaround code * Fix default encoder rotations for encoder map
* fmh.h: add matrix diagram * info.json: apply friendly formatting * physically arrange LAYOUT_all macro Move position `K5D` (right half of Split Backspace) to the end of the top row. * rename LAYOUT_all to LAYOUT_60_tsangan_hhkb * add LAYOUT_60_ansi_tsangan * add LAYOUT_60_hhkb * add LAYOUT_60_ansi_wkl * add LAYOUT_60_ansi_wkl_split_bs_rshift * enable Community Layouts support
…mk#18315) * Hillside 46 info.json: fix syntax error * Hillside 46 info.json: remove dead space * Hillside 52 info.json: remove dead space
# Conflicts: # docs/tap_hold.md # quantum/action.c
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges a recent version of QMK mainline and fixes the merge conflicts.
This also serves as the basis for making my other PRs testable by modernizing them to a recent QMK 0.18.6 version, as follows:
See my
bilateral-combinations-flashmods-0.18.6branch for a modernized version of unilateral mod-tap shouldn't send KC_GUI to computer #48.See my
bilateral-combinations-crossover-0.18.6branch for a modernized version of Crossover bilateral combinations for dual-hand chords and rolls #54.