Merge remote-tracking branch 'origin/master' into develop
Dz65v2 Settings for SBennett13 (#17747)
* 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)
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 develop
Add alternative Logos (#17787)
Constrain Cirque Pinnacle coordinates (#17803)
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)
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Make `qmk doctor` print out the last log entry for upstream/{master,develop}, including dates (#17713)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Acheron Athena support (#16818)
Co-authored-by: Drashna Jaelre <drashna@live.com>
[Docs] Updates to Pointing Device Docs (#17777)
bastardkb: fix info.json changes that got reverted during the last merge 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 develop
[Keymap] Add ollyhayes keymap (#16632)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] add DJam keyboard (#17430)
Co-authored-by: Joel Challis <git@zvecr.com>
Cirque circular scroll: Support POINTING_DEVICE_COMBINED (#17654)