QMK Bot
587f750fce
Merge remote-tracking branch 'origin/develop' into xap
2022-07-29 04:43:19 +00:00
QMK Bot
2d0443ec25
Merge remote-tracking branch 'origin/master' into develop
2022-07-29 04:42:45 +00:00
GG
b5452581da
[Keyboard] fix mistakes in promise87 config ( #17830 )
2022-07-28 21:41:42 -07:00
QMK Bot
7a706678d2
Merge remote-tracking branch 'origin/develop' into xap
2022-07-28 13:14:19 +00:00
QMK Bot
c2f68e3232
Merge remote-tracking branch 'origin/master' into develop
2022-07-28 13:13:39 +00:00
Ryan
920f983767
Move keyboard USB IDs and strings to data driven: H ( #17821 )
2022-07-28 14:12:40 +01:00
QMK Bot
9b48ca332c
Merge remote-tracking branch 'origin/develop' into xap
2022-07-28 01:03:01 +00:00
Stefan Kerkmann
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
QMK Bot
09db67eeac
Merge remote-tracking branch 'origin/develop' into xap
2022-07-28 00:57:44 +00:00
QMK Bot
476d709fa5
Merge remote-tracking branch 'origin/master' into develop
2022-07-28 00:57:13 +00:00
Less/Rikki
e7affd0541
feat: encoder map, OLED & encoder kb-level config ( #17809 )
2022-07-28 01:56:37 +01:00
zvecr
81ac1a5df5
Patch up fnv use in dynamic keymap
2022-07-28 01:43:23 +01:00
QMK Bot
0d0a3a938b
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 23:52:47 +00:00
QMK Bot
b029252e76
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 23:52:09 +00:00
Arthur
1e745c48b6
[Keymap] Add artflag kyria layout ( #17778 )
...
* Initial firmware
* feedback
* updates
* update map
2022-07-27 16:51:13 -07:00
QMK Bot
63515f8515
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 21:45:14 +00:00
QMK Bot
7bb73306d6
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 21:44:42 +00:00
Ryan
23f365b601
Move keyboard USB IDs and strings to data driven: F ( #17816 )
2022-07-27 22:44:05 +01:00
QMK Bot
08f1e8592f
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 21:13:00 +00:00
QMK Bot
5055c9a74b
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 21:12:28 +00:00
Kevin Zhao
6731712cc1
Fix SKErgo Keymap ( #17812 )
2022-07-27 22:10:57 +01:00
QMK Bot
4a2610df8f
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 19:20:32 +00:00
QMK Bot
ed5351d75e
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 19:19:51 +00:00
Ryan
4a0eb733ac
Move keyboard USB IDs and strings to data driven: G ( #17818 )
2022-07-27 20:19:09 +01:00
QMK Bot
800469c7b1
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 16:29:43 +00:00
QMK Bot
602fde61e2
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 16:29:08 +00:00
turbololvo
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
QMK Bot
a96e6b019d
Merge remote-tracking branch 'origin/develop' into xap
2022-07-27 15:03:12 +00:00
QMK Bot
df15caf407
Merge remote-tracking branch 'origin/master' into develop
2022-07-27 15:02:29 +00:00
James Young
0f40e5d0dc
Wuque Promise87 ANSI Refactor ( #17807 )
2022-07-27 08:01:37 -07:00
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
