summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-188-33/+41
|\
| * Keychron V4 Touch-Up (#21545)James Young2023-07-178-33/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | * Keychron V4 ANSI: rename LAYOUT_ansi_61 to LAYOUT_60_ansi * Keychron V4 ANSI: enable Community Layout support * Keychron V4 ISO: correct layout data Move position [3, 1] up by 0.25u. * Keychron V4 ISO: rename LAYOUT_iso_62 to LAYOUT_60_iso * Keychron V4 ISO: enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-173-17/+21
|\|
| * GMMK2 65% ANSI Touch-Up (#21544)James Young2023-07-173-17/+21
| | | | | | | | | | | | | | | | | | * [chore] correct layout data * [chore] rename LAYOUT to LAYOUT_65_ansi_blocker Also adds a layout alias so as to not have to edit the user keymaps. * [enhancement] enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-173-5/+9
|\|
| * AliceH66 Pianoforte Hotswap Touch-Up (#21542)James Young2023-07-173-5/+9
| | | | | | | | | | | | | | | | | | * [refactor] rename LAYOUT_tkl_ansi to LAYOUT_tkl_f13_ansi * [enhancement] enable Community Layout support * [chore] correct layout data Correct the position of the spacebar.
* | [Core] Update ChibiOS-Contrib (#21553)Stefan Kerkmann2023-07-171-0/+0
| |
* | quantum: remove direct `quantum.h` includes (#21507)Ryan2023-07-1651-62/+208
| |
* | Eliminate `TMK_COMMON_*` in makefiles (#21517)Ryan2023-07-1517-116/+72
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-146-0/+246
|\|
| * [Keyboard] add mothwing (#19342)tan-t2023-07-146-0/+246
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Prepare ymdk/ymd75 for rev4 (#21484)Joel Challis2023-07-1427-362/+727
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-121-1/+1
|\|
| * Bump JamesIves/github-pages-deploy-action from 4.4.2 to 4.4.3 (#21518)dependabot[bot]2023-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.4.2 to 4.4.3. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](https://github.com/jamesives/github-pages-deploy-action/compare/v4.4.2...v4.4.3) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-122-3/+3
|\|
| * Fix jaykeeb indicator state and pins (#21466)Alabahuy2023-07-122-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-128-0/+343
|\|
| * [Keyboard] Add minidivide (#19870)takashicompany2023-07-128-0/+343
| | | | | | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | process_combo: restore wait.h header (#21514)フィルターペーパー2023-07-121-0/+1
| | | | | | Required for `wait_ms()` function
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-127-0/+250
|\|
| * [Keyboard] Add new nemui65 (#21304)spbgzh2023-07-117-0/+250
| | | | | | | | | | Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-116-0/+213
|\|
| * [Keyboard] add rocketkeyboards mercury65 (#20811)drewpyun2023-07-116-0/+213
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-119-0/+603
|\|
| * [Keymap] Dothtm/0.21/60 and 75 (#21442)Mike Cramer2023-07-119-0/+603
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-112-2/+4
|\|
| * [Keyboard] Fix RS60's indicator LED (#21509)Xelus222023-07-112-2/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-1112-0/+618
|\|
| * [Keyboard] Add nix_studio/lilith (#20466)arnstadm2023-07-1112-0/+618
| | | | | | | | | | | | Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-1111-0/+682
|\|
| * [Keyboard] Add QVEX Lynepad 2.0 (#21070)seflm2023-07-1111-0/+682
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-111-16/+16
|\|
| * [Keymap] Update Zweihander Ergodox keymap (#21506)adiabatic2023-07-111-16/+16
| | | | | | Swap volume direction, add Expand/Shrink Selection buttons
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-116-0/+398
|\|
| * [Keyboard] Model H controller for IBM Model M (#20625)Jerome Berclaz2023-07-116-0/+398
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: hcbille <32437363+hcbille@users.noreply.github.com>
* | process_keycode: remove direct `quantum.h` includes (#21486)Ryan2023-07-1146-156/+258
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-114-23/+27
|\|
| * [Keyboard] Fix dactyl_lightcycle matrix positions (#21503)Duncan Sutherland2023-07-104-23/+27
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-119-0/+134
|\|
| * [Keyboard] add itstleo9 (#21460)Its TLeo2023-07-109-0/+134
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-1120-0/+877
|\|
| * [Keyboard] Add Mode M256-WS and M256-WH (#20502)Álvaro A. Volpato2023-07-1020-0/+877
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-114-7/+562
|\|
| * CMM.Studio Fuji65 Layout Additions (#21501)James Young2023-07-104-7/+562
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-1110-234/+1028
|\|
| * DTIsaac01 Layout Additions and Touch-Up (#21505)James Young2023-07-105-133/+467
| |
| * AliceH66 Pianoforte Touch-Up (#21504)James Young2023-07-105-101/+561
| |
* | Add MOUSEKEY_WHEEL_DELTA documentation (#21493)フィルターペーパー2023-07-102-3/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-07-1018-0/+580
|\|
| * [Keyboard] Add ah/haven{65,80} (#20142)Freather2023-07-1018-0/+580
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: CMM.Studio Freather <50167286+frankBTHID@users.noreply.github.com>