summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-1520-0/+1165
|\
| * [Keyboard] New Keyboard - Sugar Glider (#19933)Kyle McCreery2023-03-1520-0/+1165
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | userspace/community layout fixes (#19998)Less/Rikki2023-03-154-7/+12
| | | | | | | | | | | | | | | | | | * fixup: improve AVR detection for 60_iso/unxmaal * fixup: moved TAP_CODE_DELAY to mechmerlin/config.h * fixup: move talljoe.c to INTROSPECTION_KEYMAP_C * fixup: AVR/RGBLIGHT criteria for 60_iso/unxmaal
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-142-6/+15
|\|
| * Let's use workflows to parallelise the builds. (#20120)Nick Brassel2023-03-152-6/+15
| | | | | | | | | | | | | | * Let's use workflows to parallelise the builds. * Nofail if files aren't present. * Formatting.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-145-0/+172
|\|
| * [Keyboard] Add KP60 (#20096)d-floe2023-03-145-0/+172
| | | | | | | | | | Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-141-0/+6
|\|
| * Update newbs_getting_started to include instructions for apple silicon (#19579)Sophie Machen2023-03-141-0/+6
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-1417-0/+1261
|\|
| * RF R1 8-9Xu PCB (#20048)Cipulot2023-03-1417-0/+1261
| | | | | | | | Co-authored-by: Tom Barnes <barnestom@me.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-131-0/+12
|\|
| * Document Autocorrect callback functions (#20115)Albert Y2023-03-131-0/+12
| |
* | JSON encoder: improve sorting of layout dict keys (#19974)Ryan2023-03-133-24/+52
| |
* | Fix layout macro keys with no matrix position (#20033)Ryan2023-03-1343-508/+402
| |
* | Adjust offset for some layouts (#20075)Ryan2023-03-1350-3597/+4510
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-134-49/+20
|\|
| * Move Ferris Sweep to data-driven (#20111)Albert Y2023-03-124-49/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-124-7/+2
|\|
| * [keyboard] Prevent LED flicker when connecting AnnePro 2 (#19709)Darkhan2023-03-124-7/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-121-1/+1
|\|
| * Allow for CI builds to run for 23 hours, instead of 6. (part deux) (#20095)Nick Brassel2023-03-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-121-0/+2
|\|
| * Allow for CI builds to run for 23 hours, instead of 6. (#20094)Nick Brassel2023-03-121-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-116-0/+243
|\|
| * Add Chimera65 Hotswap keyboard (#20038)Andrew Kannan2023-03-116-0/+243
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-1112-0/+1129
|\|
| * [Keyboard] Add k83 (#19896)jonylee@hfd2023-03-1112-0/+1129
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-111-2/+2
|\|
| * Ketch LGUI/LALT key transposed on Minivan layout (#20025)Dan White2023-03-111-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-111-1/+1
|\|
| * [Keyboard] Change pierce vendor ID (#20088)azhizhinov2023-03-111-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-112-2/+6
|\|
| * Teleport native bugfix (changed F411CC wear levelling) (#20090)ebastler2023-03-112-2/+6
| | | | | | | | | | * workaround for flash size issue * enable mousekeys due to requests by some users
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2023-03-1119-1/+1523
|\|
| * Yet another adventure in trying to fit things into a 32U4 (#20091)Nick Brassel2023-03-111-1/+0
| |
| * [Keyboard] Add Spleeb default and custom firmware (#19481)Christopher Hoage2023-03-1012-0/+1391
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
| * [Keyboard] Add Binpad BN009 R2 3x3 macropad (#19992)Vino Rodrigues2023-03-107-1/+132
| | | | | | | | | | Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-112-0/+28
|\|
| * [Keyboard] VIA support for Pierce keyboard (#20045)azhizhinov2023-03-102-0/+28
| |
* | Relocate various modifier defines (#18638)Joel Challis2023-03-104-40/+59
| |
* | Add RP2040 Community Edition alias for Liatris (#19966)leah-splitkb2023-03-106-2/+18
| |
* | Move matrix config to info.json, part 5 (#20003)Ryan2023-03-11683-4315/+1764
| | | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Move matrix config to info.json, part 8 (#20030)Ryan2023-03-11536-3196/+1507
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-107-0/+274
|\|
| * Caerdroia Keyboard Firmware (#20036)Andrew Kannan2023-03-107-0/+274
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-109-90/+136
|\|
| * Zeno pcb V0.0.4 update via + fileformatting (#20023)paulgali2023-03-109-90/+136
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-103-34/+11
|\|
| * Move macro3 to data-driven (#20046)Albert Y2023-03-103-34/+11
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:44:18 +0000