summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2898-368/+316
|\
| * Move keyboard USB IDs and strings to data driven: H (#17821)Ryan2022-07-2898-368/+316
* | ChibiOS: use correct status codes in i2c_master.c (#17808)Stefan Kerkmann2022-07-281-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-286-163/+113
|\|
| * feat: encoder map, OLED & encoder kb-level config (#17809)Less/Rikki2022-07-286-163/+113
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-275-0/+254
|\|
| * [Keymap] Add artflag kyria layout (#17778)Arthur2022-07-275-0/+254
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-27100-367/+314
|\|
| * Move keyboard USB IDs and strings to data driven: F (#17816)Ryan2022-07-27100-367/+314
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-273-43/+44
|\|
| * Fix SKErgo Keymap (#17812)Kevin Zhao2022-07-273-43/+44
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2784-315/+271
|\|
| * Move keyboard USB IDs and strings to data driven: G (#17818)Ryan2022-07-2784-315/+271
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-271-1/+1
|\|
| * fix function layer to reflect cap labels (#17813)turbololvo2022-07-271-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2719-91/+268
|\|
| * Wuque Promise87 ANSI Refactor (#17807)James Young2022-07-2719-91/+268
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-07-272-0/+49
|\|
| * [Docs] Add information about WeAct Blackpill F411 (#16755)Drashna Jaelre2022-07-272-0/+49
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-271-1/+1
|\|
| * CLI compatibility for MacOS (#17811)Albert Y2022-07-271-1/+1
* | ChibiOS-Contrib: Update for RP2040 PWM and I2C driver (#17817)Stefan Kerkmann2022-07-271-0/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-262-4/+4
|\|
| * [Keyboard] Fix typo with RGB LED positioning in Iris (#17805)Danny2022-07-262-4/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2615-100/+74
|\|
| * feat: encoder map, OLED & encoder kb-level config (#17767)Less/Rikki2022-07-2615-100/+74
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2611-0/+695
|\|
| * [Keyboard] Add work louder micro (#17586)Drashna Jaelre2022-07-2611-0/+695
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-264-0/+136
|\|
| * Dz65v2 Settings for SBennett13 (#17747)Scott Bennett2022-07-264-0/+136
* | Chibios: Stop I2C peripheral on transaction error (#17798)Stefan Kerkmann2022-07-261-15/+24
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-261-0/+55
|\|
| * Add alternative Logos (#17787)Spaceman2022-07-261-0/+55
* | Constrain Cirque Pinnacle coordinates (#17803)Daniel Kao2022-07-261-6/+6
* | Avoid OOB in dynamic_keymap_reset (#17695)Joel Challis2022-07-261-5/+12
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-263-2/+69
|\|
| * Make `qmk doctor` print out the last log entry for upstream/{master,develop},...Nick Brassel2022-07-263-2/+69
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-269-0/+155
|\|
| * Added WT65-D (#17724)Wilba2022-07-269-0/+155
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2621-0/+777
|\|
| * [Keyboard] Acheron Athena support (#16818)Álvaro A. Volpato2022-07-2621-0/+777
* | [Docs] Updates to Pointing Device Docs (#17777)Drashna Jaelre2022-07-262-15/+16
* | bastardkb: fix info.json changes that got reverted during the last merge from...Charly Delay2022-07-264-21/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-268-0/+599
|\|
| * [Keymap] Add ollyhayes keymap (#16632)Olly Hayes2022-07-258-0/+599
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-269-0/+214
|\|
| * [Keyboard] add DJam keyboard (#17430)Leo Deng2022-07-259-0/+214
* | Cirque circular scroll: Support POINTING_DEVICE_COMBINED (#17654)Daniel Kao2022-07-252-13/+18
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2611-0/+476
|\|
| * [Keyboard] Add Halokeys Elemental 75 (#17323)shamit052022-07-2511-0/+476