summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-063-3/+3
|\
| * peej/tripel: correct layout data (#21145)James Young2023-06-063-3/+3
| | | | | | Corrects the layout data for all three versions of the Peej Tripel.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-061-36/+36
|\|
| * xelus/rs108: correct layout data (#21146)James Young2023-06-061-36/+36
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-067-0/+258
|\|
| * [Keyboard] Add egg58 (#21021)Travis Mick2023-06-067-0/+258
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-069-7/+492
|\|
| * [Keyboard] Add Scotto36 handwired keyboard (#21104)Joe Scotto2023-06-059-7/+492
| | | | | | | | Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-068-0/+417
|\|
| * [Keyboard] Add Scotto40 handwired keyboard (#21103)Joe Scotto2023-06-058-0/+417
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-065-0/+197
|\|
| * [Keyboard] Add ScottoStarter handwired keyboard (#21101)Joe Scotto2023-06-055-0/+197
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-061-0/+2
|\|
| * [Docs] Highlight keymap name entry (#21138)Albert Y2023-06-051-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-066-0/+153
|\|
| * [Keyboard] add kibou/harbour (#21131)FanXingStudio2023-06-056-0/+153
| |
* | Move `RGBLED_SPLIT` to data driven (#21113)Ryan2023-06-06233-191/+309
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-056-0/+139
|\|
| * [Keyboard] Add soda/mango (#21100)Jeayo Keh2023-06-056-0/+139
| | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-056-11/+255
|\|
| * [Keyboard] Upddate bioi/G60BLE to use bluetooth (#21120)Will Hedges2023-06-056-11/+255
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-051-3/+3
|\|
| * fixed E80 1800 layout macros (#21125)Moritz Plattner2023-06-051-3/+3
| |
* | Remove quantum/keymap.h (#21086)Joel Challis2023-06-051-20/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-042-1/+5
|\|
| * Fix USB PIDs on Churrosoft Deck-8 (#21126)Ramiro Bou2023-06-042-1/+5
| |
* | [Enhancement] Decouple autocorrect logic (#21116)Pablo Martínez2023-06-042-1/+19
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-041-1/+2
|\|
| * [Keyboard] Zed65 Rev.1 - Update info.json (#21122)mechlovin2023-06-041-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-034-0/+137
|\|
| * [Keyboard] Add Andean Condor (#21118)Guido Bartolucci2023-06-034-0/+137
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-0310-0/+251
|\|
| * [Keyboard] Add Churrosoft Deck-8 (#21119)Ramiro Bou2023-06-0310-0/+251
| | | | | | | | | | Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-0311-13/+518
|\|
| * [Keyboard] Add the Zed65 rev.1 PCB (#21043)mechlovin2023-06-0311-13/+518
| | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-032-15/+29
|\|
| * Update `split_3x5_2` community layout info (#21022)Duncan Sutherland2023-06-032-15/+29
| |
* | [Core] Move dynamic macro "stop recording" logic to a function (#21108)Ariane Emory2023-06-022-55/+63
| |
* | platfoms: chibios: wait: only define the frequency (#21115)dexter932023-06-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-027-0/+613
|\|
| * [keyboard] Phoenix (#21051)yiancar2023-06-027-0/+613
| | | | | | | | * Update keyboards/cablecardesigns/phoenix/
* | Revert "Add *_MATRIX_LED_COUNT generation/validation (#19515)" (#21109)Joel Challis2023-06-023-13/+1
| | | | | | This reverts commit 25c16b3adeb15466d75691162763ce062b2c6e64.
* | Add *_MATRIX_LED_COUNT generation/validation (#19515)Joel Challis2023-06-023-1/+13
| | | | | | | | | | | | | | * Add *_MATRIX_LED_COUNT parsing/validation * Disable parsing for now * Disable complexity check
* | Merge upstream uf2conv.py changes (#21107)Joel Challis2023-06-012-12/+21
| |
* | Unicodemap keycodes rename (#21092)Ryan2023-06-0155-361/+359
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-016-0/+192
|\|
| * [Keyboard] Add lightweight65 keyboard (#21034)DeskDaily2023-06-016-0/+192
| | | | | | | | | | Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com> Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-013-23/+54
|\|
| * [Keymap] z12 zigotica keymap tweaks (#20990)Sergi Meseguer2023-06-012-23/+51
| |
| * [Keymap] `zweihander-macos`: Don’t pretend to be a mouse (#20997)adiabatic2023-06-011-0/+3
| |