summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into developDasky2023-02-1416-29/+25
|\
| * Update KC_NLCK and KC_SLCK in international docs (#19521)precondition2023-02-1412-16/+16
| |
| * Update fractal attribution comment (#19832)Albert Y2023-02-131-1/+1
| |
| * Fixup swiftrax/bumblebee (reduce firmware size) (#19834)jack2023-02-133-16/+8
| |
* | Update pico-sdk to 1.5.0 (#19829)Stefan Kerkmann2023-02-131-0/+0
| |
* | Remove lingering `I2CD2` usages w/ RP2040 (#19833)jack2023-02-132-4/+2
| |
* | Add rp2040_ce and add elite-pi and helios as alias (#19830)Joel Challis2023-02-1213-9/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add rp2040_ce and add elite-pi and helios as alias (#19628) * fix git mishap * Update platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h Co-authored-by: Joel Challis <git@zvecr.com> --------- Co-authored-by: Joel Challis <git@zvecr.com> * Tidy docs --------- Co-authored-by: Conor Burns <mail@conor-burns.com>
* | Fixup `develop` compiles. (#19828)Nick Brassel2023-02-131-11/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-02-1212-0/+214
|\|
| * [Keyboard] Add Blue Team Pad (#19807)Thomas2023-02-1212-0/+214
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Make Magic handling more consistent in Action Keycode handling (#9126)Drashna Jaelre2023-02-133-7/+24
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Tidy up use of keycode range helpers (#19813)Joel Challis2023-02-124-9/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-02-121-1/+1
|\|
| * Fix serial_driver.md list item numbering (#19819)souvlakeeb2023-02-121-1/+1
| |
* | core: allow locking the matrix state (#18852)dexter932023-02-132-1/+15
| | | | | | | | | | | | Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Stefan Kerkmann <karlk90@pm.me> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Add combo hook to allow per layer combo reference layers. (#16699)Eric.a Gebhart2023-02-133-8/+104
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Refactor Leader key feature (#19632)Ryan2023-02-1377-1950/+2439
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Restore packing of midi note keycodes (#19468)Joel Challis2023-02-132-141/+1185
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2023-02-133-3/+4
|\|
| * Fix layout aliases for two boards (#19818)Ryan2023-02-122-1/+4
| |
| * Reduce synthlabs/060 firmware size (#19814)jack2023-02-121-3/+0
| |
* | Fix build failures with `OPT = 0` due to inline functions (#19767)Sergey Vlasov2023-02-125-1/+34
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | [Bug] Fix tri layer compiler issue if NO_ACTION_LAYER is defined (#19821)Drashna Jaelre2023-02-121-0/+2
| |
* | Remove `config.h` include from quantum files (#19817)jack2023-02-123-3/+0
| |
* | Fixup ek65 -- add processor & bootloader in info.json (#19815)jack2023-02-121-0/+2
| |
* | [Core] Tri Layer Keys (#19795)Drashna Jaelre2023-02-1219-15/+377
| | | | | | | | | | | | | | Co-authored-by: wilba <wilba@wilba.tech> Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-02-111-1/+7
|\|
| * Update documentation for LM(layer, mod) (#19284)precondition2023-02-111-1/+7
| | | | | | | | | | * Update documentation for LM(layer, mod) * Move LM table to caveats section
* | Reduce false positives in layout name validation (#19646)Joel Challis2023-02-111-12/+27
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-02-111-4/+4
|\|
| * [Docs] Resynchronizing Your Branch including submodules (#19268)Luis Moreno2023-02-111-4/+4
| |
* | [Keyboard] Fix merge error with fave84 board (#19808)Drashna Jaelre2023-02-111-7/+5
| |
* | Remove matrix_init_quantum/matrix_scan_quantum (#19806)Joel Challis2023-02-1176-319/+148
| |
* | Generate encodermap output from keymap.json. (#18915)Nick Brassel2023-02-112-74/+121
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-02-100-0/+0
|\|
| * Fix bear65 (#19805)Xelus222023-02-101-1/+1
| |
* | Typographic updates to source generation (#19160)Jouke Witteveen2023-02-102-23/+22
| |
* | Tidy up use of keycode range helpers (#19756)Joel Challis2023-02-1016-33/+39
| |
* | Move more unicode ranges to DD (#19755)Joel Challis2023-02-103-5/+16
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-02-109-6/+569
|\|
| * [Keyboard] Update Pachi RGB Rev2 VIA custom indicators (#19788)Xelus222023-02-103-6/+370
| |
| * [Keyboard] Add the Twilight by MD (#19787)Wolf Van Herreweghe2023-02-106-0/+199
| | | | | | Co-authored-by: Wolf <contact@vwolf.be>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-02-105-0/+168
|\|
| * [Keyboard] Add Dactyl 6x5 68 keys (#18679)kpagratis2023-02-105-0/+168
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-02-101-1/+1
|\|
| * [Docs] Combos example consistently uses A B keys (#19792)Arialdo Martini2023-02-101-1/+1
| |
* | [Docs] Change defines to enums in examples (#19793)Pablo Martínez2023-02-103-9/+15
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2023-02-10113-641/+5684
|\|
| * [Keyboard] Add alas keyboard (#19717)yiancar2023-02-109-0/+363
| | | | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: yiancar <yiancar@gmail.com>
| * [Keyboard] Flinguenheld (#19661)FLinguenheld2023-02-1010-0/+1835
| |