summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-161-1/+1
|\
| * Fix typo in `feature_wpm.md` title (#20464)LawsonStation2023-04-161-1/+1
| |
* | Fix info.json LTO and format encoder definitions (#20456)Ryan2023-04-1560-225/+108
| |
* | [Keymap] Update brauner preonic layout (#20439)Christian Brauner2023-04-152-0/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-166-0/+239
|\|
| * [Keyboard] Add Kalakos Bahrnob65 (#20424)Zykrah2023-04-156-0/+239
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-162-2/+1
|\|
| * Tidy up stray RGB_DISABLE_TIMEOUT references (#20460)Joel Challis2023-04-152-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-167-0/+268
|\|
| * [Keyboard] Add zoom75 wired (#20396)spbgzh2023-04-157-0/+268
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-159-0/+400
|\|
| * [Keyboard] Add dymium65 (#20257)Wycer2023-04-159-0/+400
| | | | | | | | | | | | | | | | Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Wycer <wycers@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: linyer-qwq <990842844@qq.com> Co-authored-by: Linyer-qwq <32816392+Linyer-qwq@users.noreply.github.com>
* | Merge remote-tracking branch 'upstream/master' into developJames Young2023-04-1515-51/+475
|\|
| * Lotus58 glow (#20386)Markus Knutsson2023-04-1511-0/+313
| | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
| * ADPenrose Obi Layout Macro Conversion and Addition (#20445)James Young2023-04-156-84/+168
| | | | | | | | | | | | | | | | | | * add matrix_diagram.md * info.json: apply friendly formatting * move matrix data to info.json * add LAYOUT_625u_space with reference keymap
* | Encodermap direction define. (#20454)Nick Brassel2023-04-15319-319/+320
| |
* | Move single `60_ansi`, `60_hhkb` and `60_iso` layouts to data driven (#20438)Ryan2023-04-1585-3482/+2335
| |
* | Move single `LAYOUT_all`s to data driven (#20430)Ryan2023-04-15523-20598/+18850
| |
* | Move remaining `LAYOUT`s to data driven (#20422)Ryan2023-04-15181-15082/+17939
| |
* | Fix some missing QMK_KEYBOARD_H includes in user keymaps (#20417)Ryan2023-04-1445-516/+349
| |
* | [Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (#20433)Drashna Jaelre2023-04-123-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-132-2/+4
|\|
| * Add hardware information momokai keyboards (#20434)Albert Y2023-04-122-2/+4
| |
* | [Keyboard] Update ymdk/id75 config (#20432)Drashna Jaelre2023-04-122-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2023-04-123-85/+305
|\|
| * 4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (#20414)James Young2023-04-123-85/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * add matrix_diagram.md * move matrix data to info.json * add LAYOUT_60_ansi_split_bs_rshift * add LAYOUT_60_tsangan_hhkb * add LAYOUT_60_hhkb
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-126-0/+406
|\|
| * [Keymap] Add paulomp90 lily58 keymap (#20327)Paulo Pereira2023-04-126-0/+406
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-124-0/+247
|\|
| * [Keymap] Add personal keymap for Lily58 (#18735)Tommy Oldfield2023-04-124-0/+247
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-121-1/+1
|\|
| * [Keyboard] Fix h87 g2 VID conflict (#20388)Josh Hinnebusch2023-04-121-1/+1
| |
* | [Keyboard] Add support for ISO version of Durgod Hades (#20110)Moritz Plattner2023-04-1225-6/+443
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-124-0/+428
|\|
| * [Keymap] PHSC138 Keymap for Atom47 (#18768)Ryan2023-04-124-0/+428
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-123-1/+24
|\|
| * [Keyboard] add kb2040 flavor of gherkin (#18360)Jeff Epler2023-04-123-1/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-1210-0/+485
|\|
| * [Keyboard] ymdk/id75 (#19967)Less/Rikki2023-04-1210-0/+485
| | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | quantum/action_util.c: Use uint8_t for oneshot_layer_data (#20423)Manuel Ullmann2023-04-121-1/+1
| |
* | Fix preprocessor condition for SPLIT_HAPTIC_ENABLE (#20411)Giuseppe Rota2023-04-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-121-2/+2
|\|
| * fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (#20420)Mike Killewald2023-04-121-2/+2
| |
* | Move single `LAYOUT`s to data driven (#20365)Ryan2023-04-121443-60150/+45441
| |
* | Merge remote-tracking branch 'origin/master' into developJames Young2023-04-112-100/+142
|\|
| * 4pplet/bootleg/rev_a Layout Macro Conversion and Addition (#20400)James Young2023-04-113-117/+142
| | | | | | | | | | | | | | * info.json: apply friendly formatting * move matrix data to info.json * add LAYOUT_60_ansi_split_bs_rshift
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-116-237/+190
|\|
| * 4pplet/aekiso60 Layout Macro Conversion and Additions (#20399)James Young2023-04-118-257/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add matrix_diagram.md Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files. * info.json: apply friendly formatting * move matrix data to info.json * create keyboard-level info.json * add LAYOUT_60_iso_tsangan * enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-04-111-0/+3
|\|
| * Reject info.json at keymap level (#20408)Joel Challis2023-04-111-0/+3
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 16:57:51 +0000