zvecr
3c20f00238
Merge remote-tracking branch 'origin/develop' into xap
2022-04-16 23:49:41 +01:00
Stefan Kerkmann
147e57fd59
[QP] Check BPP capabilities before loading the palette ( #16863 )
2022-04-17 08:30:51 +10:00
Simon Arlott
5841c755ae
rgblight: Add functions to stop blinking one or all but one layer ( #16859 )
2022-04-17 00:02:32 +02:00
Albert Y
e5918cf968
Heatmap incorrect matrix effect workaround ( #16315 )
2022-04-16 11:34:07 -07:00
QMK Bot
030a96a3f5
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 18:28:19 +00:00
moyi4681
3b6e48b012
[Keyboard] Add Phase One keyboard ( #16430 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-04-16 11:28:16 -07:00
Amber Cronin
6d13199ed0
Fix Xorg segfault with KeebCats PCBs ( #16434 )
2022-04-16 11:27:51 -07:00
Jouke Witteveen
8f585153c4
Add GET_TAPPING_TERM macro to reduce duplicate code ( #16681 )
...
* Add GET_TAPPING_TERM macro to reduce duplicate code
The macro gives the right tapping term depending on whether per-key
tapping terms and/or dynamic tapping terms are enabled. Unnecessary
function calls and variable resolution are avoided.
Fixes #16472 .
* Use GET_TAPPING_TERM for Cirque trackpads
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-04-16 11:24:09 -07:00
QMK Bot
cad0af09a8
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 18:19:59 +00:00
X-Bows Tech
7d75f88ac9
[Keyboard] Update X-Bows Keyboard ( #16765 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Shulin <mumu@x-bows.com>
2022-04-16 11:19:24 -07:00
Joel Challis
92a61aa0cd
Implement XAP 'secure' core requirements ( #16843 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-04-16 11:13:05 -07:00
QMK Bot
c79bfc6ed9
Merge remote-tracking branch 'origin/develop' into xap
2022-04-16 17:41:49 +00:00
QMK Bot
ae4d518352
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 17:41:18 +00:00
Simon Arlott
1cfe49714f
rgblight: Limit max repeat times in rgblight_blink_layer_repeat ( #16860 )
2022-04-16 10:40:48 -07:00
QMK Bot
78acf2c1a1
Merge remote-tracking branch 'origin/develop' into xap
2022-04-16 01:24:26 +00:00
QMK Bot
14d084ae13
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 01:23:46 +00:00
Joel Challis
b331c98ca4
Resolve layout macro inconsistencies for rmkeebs/rm_numpad ( #16856 )
2022-04-16 02:23:19 +01:00
QMK Bot
425b80ddd6
Merge remote-tracking branch 'origin/develop' into xap
2022-04-14 18:25:13 +00:00
QMK Bot
59885d07af
Merge remote-tracking branch 'origin/master' into develop
2022-04-14 18:24:36 +00:00
Will Winder
8de4065b09
[Keyboard] Add avalanche ( #16407 )
...
* [Keyboard] Add avalanche
* PR feedback
* Update keyboards/avalanche/v1/config.h
* Update keyboards/avalanche/v1/v1.h
* Update keyboards/avalanche/v2/config.h
* Update keyboards/avalanche/v2/v2.h
* Update keyboards/avalanche/v3/config.h
* Update keyboards/avalanche/v3/v3.h
* Apply suggestions from code review
* Remove rules.mk comment and fix other comments.
* Shared encoder code, follow conventions in rules.mk files.
* Remove config files which do not change defaul behavior.
2022-04-14 11:23:32 -07:00
QMK Bot
331b232ba1
Merge remote-tracking branch 'origin/develop' into xap
2022-04-14 17:02:35 +00:00
QMK Bot
399de0be12
Merge remote-tracking branch 'origin/master' into develop
2022-04-14 17:02:01 +00:00
Tim Liu
b9e11253c4
[Keyboard] Add via support for creatkeebs/glacier ( #16747 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2022-04-14 10:01:26 -07:00
QMK Bot
37f92fad65
Merge remote-tracking branch 'origin/develop' into xap
2022-04-14 16:27:46 +00:00
QMK Bot
cbc59e383f
Merge remote-tracking branch 'origin/master' into develop
2022-04-14 16:27:09 +00:00
holtenc
812f97e241
[Keyboard] move/rename obro to Meridian RGB ( #16828 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2022-04-14 09:26:24 -07:00
QMK Bot
3f0c7f1921
Merge remote-tracking branch 'origin/develop' into xap
2022-04-14 05:43:34 +00:00
QMK Bot
a6884e6933
Merge remote-tracking branch 'origin/master' into develop
2022-04-14 05:43:00 +00:00
Drashna Jaelre
a4a67d515e
Ignore VIA(L) json files ( #16845 )
2022-04-14 15:42:24 +10:00
QMK Bot
ff198b384b
Merge remote-tracking branch 'origin/develop' into xap
2022-04-14 03:28:33 +00:00
QMK Bot
88028dd982
Merge remote-tracking branch 'origin/master' into develop
2022-04-14 03:28:03 +00:00
leah-splitkb
18e56902c9
Fix external flash on AVR ( #16851 )
2022-04-14 13:27:26 +10:00
QMK Bot
fcb549f36c
Merge remote-tracking branch 'origin/develop' into xap
2022-04-13 16:46:28 +00:00
QMK Bot
2858415789
Merge remote-tracking branch 'origin/master' into develop
2022-04-13 16:45:55 +00:00
jack
46c0db458e
[Keyboard] Fix kay65 - Missing keycode ( #16849 )
2022-04-13 09:45:16 -07:00
QMK Bot
3503d1c27b
Merge remote-tracking branch 'origin/develop' into xap
2022-04-13 16:28:29 +00:00
QMK Bot
4a8743cdb1
Merge remote-tracking branch 'origin/master' into develop
2022-04-13 16:27:55 +00:00
jack
f3004d960f
[Keyboard] Fix waffling80 - Missing comma ( #16848 )
2022-04-13 09:27:20 -07:00
QMK Bot
f951028c94
Merge remote-tracking branch 'origin/develop' into xap
2022-04-13 14:32:05 +00:00
QMK Bot
6814e32757
Merge remote-tracking branch 'origin/master' into develop
2022-04-13 14:31:55 +00:00
QMK Bot
7f4f38dcac
Merge remote-tracking branch 'origin/develop' into xap
2022-04-13 14:31:23 +00:00
ClicketySplit
8580380eec
[Keyboard] The inaugural commit for Leeloo's firmware. ( #16599 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-04-13 07:31:11 -07:00
QMK Bot
294ef95bc9
Merge remote-tracking branch 'origin/master' into develop
2022-04-13 14:29:44 +00:00
N L
0272621133
[Keymap] bépo layout on Lily58L ( #16243 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-04-13 07:29:06 -07:00
QMK Bot
1e6ef5d42e
Merge remote-tracking branch 'origin/master' into develop
2022-04-13 14:29:05 +00:00
Rucker Machine
57466c47ba
[Keyboard] Add RM_Numpad ( #15983 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jason <jrucker2004@gmail.com>
2022-04-13 07:28:12 -07:00
QMK Bot
46292f5098
Merge remote-tracking branch 'origin/master' into develop
2022-04-13 14:27:27 +00:00
Tyler Tolley
973bc88b0f
[Keymap] Add thattolleyguy keymaps ( #15351 )
...
* Adding personal keymaps
* Update licenses
* Fix RGB settings
* Define used animations
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-04-13 07:27:07 -07:00
QMK Bot
c6511ad9bc
Merge remote-tracking branch 'origin/develop' into xap
2022-04-13 14:26:13 +00:00
QMK Bot
c4a6636873
Merge remote-tracking branch 'origin/master' into develop
2022-04-13 14:25:32 +00:00