summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-28Move keyboard USB IDs and strings to data driven: H (#17821)Ryan
2022-07-28ChibiOS: use correct status codes in i2c_master.c (#17808)Stefan Kerkmann
msg_t is MSG_OK in the success case and either MSG_RESET or MSG_TIMEOUT in case of errors. So actually use them in the comparison.
2022-07-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-28feat: encoder map, OLED & encoder kb-level config (#17809)Less/Rikki
2022-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-27[Keymap] Add artflag kyria layout (#17778)Arthur
* Initial firmware * feedback * updates * update map
2022-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-27Move keyboard USB IDs and strings to data driven: F (#17816)Ryan
2022-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-27Fix SKErgo Keymap (#17812)Kevin Zhao
2022-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-27Move keyboard USB IDs and strings to data driven: G (#17818)Ryan
2022-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-27fix function layer to reflect cap labels (#17813)turbololvo
These changes correctly reflect the keycap labels on the Vortex Race 3.
2022-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-27Wuque Promise87 ANSI Refactor (#17807)James Young
2022-07-27Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2022-07-27[Docs] Add information about WeAct Blackpill F411 (#16755)Drashna Jaelre
* [Docs] Add information about WeAct Blackpill F411 * Add clarification for matrix pins * Update documentation * Tweak wording
2022-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-27CLI compatibility for MacOS (#17811)Albert Y
2022-07-27ChibiOS-Contrib: Update for RP2040 PWM and I2C driver (#17817)Stefan Kerkmann
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-26[Keyboard] Fix typo with RGB LED positioning in Iris (#17805)Danny
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-26feat: encoder map, OLED & encoder kb-level config (#17767)Less/Rikki
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-26[Keyboard] Add work louder micro (#17586)Drashna Jaelre
* [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>
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-26Dz65v2 Settings for SBennett13 (#17747)Scott Bennett
* 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
2022-07-26Chibios: Stop I2C peripheral on transaction error (#17798)Stefan Kerkmann
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>
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-26Add alternative Logos (#17787)Spaceman
2022-07-26Constrain Cirque Pinnacle coordinates (#17803)Daniel Kao
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.
2022-07-26Avoid OOB in dynamic_keymap_reset (#17695)Joel Challis
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-26Make `qmk doctor` print out the last log entry for ↵Nick Brassel
upstream/{master,develop}, including dates (#17713)
2022-07-26Added WT65-D (#17724)Wilba
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-26[Keyboard] Acheron Athena support (#16818)Álvaro A. Volpato
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-26[Docs] Updates to Pointing Device Docs (#17777)Drashna Jaelre
2022-07-26bastardkb: fix info.json changes that got reverted during the last merge ↵Charly Delay
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`
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-25[Keymap] Add ollyhayes keymap (#16632)Olly Hayes
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-25[Keyboard] add DJam keyboard (#17430)Leo Deng
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-25Cirque circular scroll: Support POINTING_DEVICE_COMBINED (#17654)Daniel Kao
2022-07-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-25[Keyboard] Add Halokeys Elemental 75 (#17323)shamit05
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>