QMK Bot
f73d2206a1
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 14:41:26 +00:00
Drashna Jael're
3d98269652
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 07:40:30 -07:00
Drashna Jaelre
8973835183
[Docs] Add information about WeAct Blackpill F411 ( #16755 )
...
* [Docs] Add information about WeAct Blackpill F411
* Add clarification for matrix pins
* Update documentation
* Tweak wording
2022-07-27 14:49:12 +01:00
QMK Bot
720ba5296e
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 09:30:24 +00:00
QMK Bot
00c1653a15
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 09:29:50 +00:00
Albert Y
3285659690
CLI compatibility for MacOS ( #17811 )
2022-07-27 10:29:10 +01:00
QMK Bot
562ac60dfc
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 08:07:35 +00:00
Stefan Kerkmann
59d940c9f3
ChibiOS-Contrib: Update for RP2040 PWM and I2C driver ( #17817 )
2022-07-27 10:06:18 +02:00
QMK Bot
f6c5e68371
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 20:49:37 +00:00
QMK Bot
5df7cfdeb4
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 20:48:59 +00:00
Danny
dc48b3fd04
[Keyboard] Fix typo with RGB LED positioning in Iris ( #17805 )
2022-07-26 13:48:07 -07:00
QMK Bot
695d620392
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 20:26:36 +00:00
QMK Bot
ff5848992c
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 20:25:59 +00:00
Less/Rikki
fc9654a1d0
feat: encoder map, OLED & encoder kb-level config ( #17767 )
2022-07-26 21:25:23 +01:00
QMK Bot
ee295d2bd8
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 19:51:55 +00:00
QMK Bot
53ca6338c7
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 19:51:21 +00:00
Drashna Jaelre
5f36285fc5
[Keyboard] Add work louder micro ( #17586 )
...
* [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-26 20:50:45 +01:00
QMK Bot
ce9e5ef048
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 19:44:53 +00:00
QMK Bot
e0e1f0af92
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 19:44:06 +00:00
Scott Bennett
9dbc0473ef
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
2022-07-26 20:43:26 +01:00
QMK Bot
9b7e277678
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 19:40:48 +00:00
Stefan Kerkmann
083b42068a
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>
2022-07-26 21:40:14 +02:00
QMK Bot
734227951c
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 19:16:23 +00:00
QMK Bot
2899e69ead
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 19:15:45 +00:00
Spaceman
d4bb5a9820
Add alternative Logos ( #17787 )
2022-07-26 20:15:08 +01:00
QMK Bot
8c5a9d1c5e
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 18:36:17 +00:00
Daniel Kao
b8b2e99976
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.
2022-07-26 19:35:41 +01:00
QMK Bot
5d61b84698
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 16:38:45 +00:00
Joel Challis
c982d6c5e3
Avoid OOB in dynamic_keymap_reset ( #17695 )
2022-07-26 17:38:28 +01:00
QMK Bot
545f7da5cd
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 16:38:14 +00:00
QMK Bot
61da9286a1
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 16:38:06 +00:00
QMK Bot
0534b878c3
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 16:37:29 +00:00
Nick Brassel
d1434b6d75
Make qmk doctor print out the last log entry for upstream/{master,develop}, including dates ( #17713 )
2022-07-26 17:37:28 +01:00
Wilba
501276a8fd
Added WT65-D ( #17724 )
2022-07-26 17:36:30 +01:00
QMK Bot
834364ceb7
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 08:00:58 +00:00
QMK Bot
1cf68476cc
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 08:00:23 +00:00
Álvaro A. Volpato
b0b14cc440
[Keyboard] Acheron Athena support ( #16818 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-26 00:59:38 -07:00
QMK Bot
77b7fa437f
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 07:28:15 +00:00
Drashna Jaelre
5d898a3d34
[Docs] Updates to Pointing Device Docs ( #17777 )
2022-07-26 00:27:34 -07:00
QMK Bot
2702e823c0
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 06:42:02 +00:00
Charly Delay
244450625a
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`
2022-07-26 07:41:24 +01:00
QMK Bot
722c806043
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 06:27:35 +00:00
QMK Bot
9f5b71bada
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 06:27:00 +00:00
QMK Bot
7ae0ce6660
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 06:26:31 +00:00
Olly Hayes
77e48f5b7e
[Keymap] Add ollyhayes keymap ( #16632 )
2022-07-25 23:26:22 -07:00
QMK Bot
9825b66cac
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 06:26:00 +00:00
Leo Deng
ddae04bca1
[Keyboard] add DJam keyboard ( #17430 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-25 23:25:28 -07:00
QMK Bot
0a220ed6e7
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 06:20:10 +00:00
Daniel Kao
1de6811ebe
Cirque circular scroll: Support POINTING_DEVICE_COMBINED ( #17654 )
2022-07-25 23:19:33 -07:00
QMK Bot
21a97ba809
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 05:37:43 +00:00
