c2f68e3232
Merge remote-tracking branch 'origin/master' into develop
2022-07-28 13:13:39 +00:00
920f983767
Move keyboard USB IDs and strings to data driven: H ( #17821 )
2022-07-28 14:12:40 +01:00
157ea96411
ChibiOS: use correct status codes in i2c_master.c ( #17808 )
...
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-28 02:02:10 +01:00
476d709fa5
Merge remote-tracking branch 'origin/master' into develop
2022-07-28 00:57:13 +00:00
e7affd0541
feat: encoder map, OLED & encoder kb-level config ( #17809 )
2022-07-28 01:56:37 +01:00
b029252e76
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 23:52:09 +00:00
1e745c48b6
[Keymap] Add artflag kyria layout ( #17778 )
...
* Initial firmware
* feedback
* updates
* update map
2022-07-27 16:51:13 -07:00
7bb73306d6
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 21:44:42 +00:00
23f365b601
Move keyboard USB IDs and strings to data driven: F ( #17816 )
2022-07-27 22:44:05 +01:00
5055c9a74b
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 21:12:28 +00:00
6731712cc1
Fix SKErgo Keymap ( #17812 )
2022-07-27 22:10:57 +01:00
ed5351d75e
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 19:19:51 +00:00
4a0eb733ac
Move keyboard USB IDs and strings to data driven: G ( #17818 )
2022-07-27 20:19:09 +01:00
602fde61e2
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 16:29:08 +00:00
c788857b6b
fix function layer to reflect cap labels ( #17813 )
...
These changes correctly reflect the keycap labels on the Vortex Race 3.
2022-07-27 17:27:39 +01:00
df15caf407
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 15:02:29 +00:00
0f40e5d0dc
Wuque Promise87 ANSI Refactor ( #17807 )
2022-07-27 08:01:37 -07:00
3d98269652
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 07:40:30 -07:00
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
00c1653a15
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 09:29:50 +00:00
3285659690
CLI compatibility for MacOS ( #17811 )
2022-07-27 10:29:10 +01:00
59d940c9f3
ChibiOS-Contrib: Update for RP2040 PWM and I2C driver ( #17817 )
2022-07-27 10:06:18 +02:00
5df7cfdeb4
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 20:48:59 +00:00
dc48b3fd04
[Keyboard] Fix typo with RGB LED positioning in Iris ( #17805 )
2022-07-26 13:48:07 -07:00
ff5848992c
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 20:25:59 +00:00
fc9654a1d0
feat: encoder map, OLED & encoder kb-level config ( #17767 )
2022-07-26 21:25:23 +01:00
53ca6338c7
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 19:51:21 +00:00
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
e0e1f0af92
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 19:44:06 +00:00
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
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
2899e69ead
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 19:15:45 +00:00
d4bb5a9820
Add alternative Logos ( #17787 )
2022-07-26 20:15:08 +01:00
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
c982d6c5e3
Avoid OOB in dynamic_keymap_reset ( #17695 )
2022-07-26 17:38:28 +01:00
61da9286a1
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 16:38:06 +00:00
0534b878c3
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 16:37:29 +00:00
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
501276a8fd
Added WT65-D ( #17724 )
2022-07-26 17:36:30 +01:00
1cf68476cc
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 08:00:23 +00:00
b0b14cc440
[Keyboard] Acheron Athena support ( #16818 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com >
2022-07-26 00:59:38 -07:00
5d898a3d34
[Docs] Updates to Pointing Device Docs ( #17777 )
2022-07-26 00:27:34 -07:00
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
9f5b71bada
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 06:27:00 +00:00
77e48f5b7e
[Keymap] Add ollyhayes keymap ( #16632 )
2022-07-25 23:26:22 -07:00
9825b66cac
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 06:26:00 +00:00
ddae04bca1
[Keyboard] add DJam keyboard ( #17430 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
2022-07-25 23:25:28 -07:00
1de6811ebe
Cirque circular scroll: Support POINTING_DEVICE_COMBINED ( #17654 )
2022-07-25 23:19:33 -07:00
2456044d5f
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 05:36:55 +00:00
91d911eb1f
[Keyboard] Add Halokeys Elemental 75 ( #17323 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
2022-07-25 22:36:11 -07:00
