summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | These changes correctly reflect the keycap labels on the Vortex Race 3.
* | 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
| | | | | | | | | | | | | | | | | | * [Docs] Add information about WeAct Blackpill F411 * Add clarification for matrix pins * Update documentation * Tweak wording
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add work louder micro * Update keyboards/work_louder/micro/readme.md * Update readme * Update kb config files * Update to use encoder map Co-authored-by: Tom Barnes <barnestom@me.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-264-0/+136
|\|
| * Dz65v2 Settings for SBennett13 (#17747)Scott Bennett2022-07-264-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Start of dz65v2 map for sbennett13 * No wpm, disable some rgb, ~copyright~ * No more raindrops * Remove more rgb modes and set default * Almost orgot this crappy thing * cannot define startup :( * Layered esc is kc_grv * Start of dz65v2 map for sbennett13 * No wpm, disable some rgb, ~copyright~ * No more raindrops * Remove more rgb modes and set default * Almost orgot this crappy thing * cannot define startup :( * Layered esc is kc_grv * Add license to config and keymap
* | Chibios: Stop I2C peripheral on transaction error (#17798)Stefan Kerkmann2022-07-261-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | From the ChibiOS HAL I2C driver pages: After a timeout the driver must be stopped and restarted because the bus is in an uncertain state. This commit does that stopping explicitly on any error that occurred, not only timeouts. As all the i2c functions restart the peripheral if necessary it is safe to do so. Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
* | 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
| | | | | | | | | | | | Static x & y should be the same type as touchData.xValue & touchData.yValue: uint16_t. Their delta could be larger than int8_t and should be constrained to mouse_xy_report_t.
* | 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 ↵Nick Brassel2022-07-263-2/+69
| | | | | | | | upstream/{master,develop}, including dates (#17713)
* | 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
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [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 ↵Charly Delay2022-07-264-21/+3
| | | | | | | | | | | | | | from `master` to `develop` (#17800) * bastardkb: fix info.json changes that got reverted during the last merge from `master` to `develop` * Remove board name from root folder `info.json`
* | 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
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | 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
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-269-0/+593
|\|
| * [Keyboard] Add Kawayo Keyboard (#17454)Cipulot2022-07-259-0/+593
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2610-0/+380
|\|
| * [Keyboard] Add Star75 support (#17421)hornslyn2022-07-2510-0/+380
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Add RP2040 config defaults for ferris/sweep and cradio (#17557)Albert Y2022-07-254-25/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-261-229/+42
|\|
| * takashicompany miniZone: fix QMK Configurator implementation (#17801)James Young2022-07-251-229/+42
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 06:05:09 +0000