Commit Graph

2483 Commits

Author SHA1 Message Date
QMK Bot
515a318de5 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 05:31:22 +00:00
Joel Challis
b01dc36fbf
Tidy up duplication of MIN/MAX fallback implementations (#20236) 2023-03-23 05:30:30 +00:00
zvecr
42895141de Decouple lighting_map from XAP 2023-03-23 00:48:52 +00:00
zvecr
5eed80c66b Fix up after merge 2023-03-23 00:47:03 +00:00
QMK Bot
e92968d813 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 00:37:51 +00:00
Joel Challis
6540b31d71
Add some helpers to tidy up XAP (#20235) 2023-03-23 00:37:13 +00:00
zvecr
5f7e520f8f Strip out XAP_GETTER for now 2023-03-22 21:21:02 +00:00
QMK Bot
7703f1edc5 Merge remote-tracking branch 'origin/develop' into xap 2023-03-22 03:33:26 +00:00
Ryan
9c3c159286
Update Doxygen comments for some headers (#20194) 2023-03-22 14:32:49 +11:00
QMK Bot
61bac5bc03 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 09:16:51 +00:00
Nick Brassel
a518e1e5d8
Sync activity timestamps between sides. (#20192)
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2023-03-21 10:16:11 +01:00
QMK Bot
466df11fe9 Merge remote-tracking branch 'origin/develop' into xap 2023-03-20 03:14:30 +00:00
Nick Brassel
cd94ba031c
Quantum Painter QoL enhancements -- auto-poweroff, auto-flush, buffer sizing (#20013) 2023-03-20 14:13:53 +11:00
QMK Bot
09b341a9ed Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 02:28:07 +00:00
Joel Challis
a974c51d25
Relocate various modifier defines (#18638) 2023-03-10 18:27:29 -08:00
QMK Bot
fab57f4434 Merge remote-tracking branch 'origin/develop' into xap 2023-03-08 06:39:28 +00:00
QMK Bot
43648760c4 Merge remote-tracking branch 'origin/master' into develop 2023-03-08 06:38:46 +00:00
Joel Challis
952b88528f
Fix processing of recently added system keycodes (#20058) 2023-03-08 06:38:11 +00:00
QMK Bot
22e5ae2ed2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-03 17:51:19 +00:00
Joel Challis
3be5d90b6d
Remove some use of keymap.h (#20006) 2023-03-03 17:50:40 +00:00
QMK Bot
578b3981be Merge remote-tracking branch 'origin/develop' into xap 2023-03-03 11:27:28 +00:00
Joel Challis
c3c40dfda8
Remove some use of keymap.h (#19980) 2023-03-03 11:26:53 +00:00
QMK Bot
67bb3ae46b Merge remote-tracking branch 'origin/develop' into xap 2023-02-22 22:50:46 +00:00
Joel Challis
9f2cd9119f
Reallocate user/kb keycode ranges (#19907) 2023-02-23 09:50:09 +11:00
QMK Bot
c96cabad93 Merge remote-tracking branch 'origin/develop' into xap 2023-02-22 22:49:43 +00:00
Joel Challis
961f0b7b2d
Reallocate SAFE_RANGE (#19909) 2023-02-23 09:49:07 +11:00
QMK Bot
5cab00593f Merge remote-tracking branch 'origin/develop' into xap 2023-02-22 22:20:05 +00:00
Nick Brassel
7f805cc779
VIA Protocol 12 + fixes (#19916)
Co-authored-by: Wilba <wilba@wilba.tech>
Co-authored-by: zvecr <git@zvecr.com>
2023-02-23 09:19:00 +11:00
QMK Bot
f6ba9a8875 Merge remote-tracking branch 'origin/develop' into xap 2023-02-22 21:15:08 +00:00
Joel Challis
403b0addea
Align magic keycodes (#19877) 2023-02-23 08:14:29 +11:00
QMK Bot
af101a13bc Merge remote-tracking branch 'origin/develop' into xap 2023-02-22 19:04:30 +00:00
precondition
93f2ed3abf
[Bug] Fix compilation error when defining QUICK_TAP_TERM_PER_KEY (#19893) 2023-02-22 11:03:36 -08:00
QMK Bot
ed1e550bc1 Merge remote-tracking branch 'origin/develop' into xap 2023-02-19 08:00:25 +00:00
Joel Challis
0152dd811d
Move KC_MISSION_CONTROL/KC_LAUNCHPAD keycodes to core (#19884) 2023-02-19 18:59:50 +11:00
QMK Bot
e2edc0991c Merge remote-tracking branch 'origin/develop' into xap 2023-02-19 01:08:38 +00:00
Drashna Jaelre
48a79b08cc
Fix functions when NO_ACTION_TAPPING is defined (#11528) 2023-02-19 12:08:03 +11:00
Nick Brassel
7661682787
PROGMEM led mappings 2023-02-19 11:51:29 +11:00
QMK Bot
805239761e Merge remote-tracking branch 'origin/develop' into xap 2023-02-18 15:45:15 +00:00
Joel Challis
f587a0c548
Align sequencer keycodes (#19875) 2023-02-18 15:44:36 +00:00
QMK Bot
3bcf60f81b Merge remote-tracking branch 'origin/develop' into xap 2023-02-15 21:07:00 +00:00
Drashna Jaelre
a63808c23f
[Bug] Fix compiliation issue for Key Overrides (#19856) 2023-02-15 21:06:10 +00:00
QMK Bot
b6bc3a0b5d Merge remote-tracking branch 'origin/develop' into xap 2023-02-14 20:44:53 +00:00
Pascal Getreuer
7d692d64f3
Fix Layer Mod handling of with right-handed mods. (#19845) 2023-02-14 12:44:42 -08:00
Albert Y
9908ed7ecd
Add swap hands status function (#19831)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-14 12:44:18 -08:00
QMK Bot
68e301586a Merge remote-tracking branch 'origin/develop' into xap 2023-02-14 03:21:02 +00:00
Dasky
74770ac79b Merge branch 'master' into develop 2023-02-14 03:05:44 +00:00
Albert Y
cd91a3ced7
Update fractal attribution comment (#19832) 2023-02-13 10:58:27 -07:00
QMK Bot
7c4bc79c1d Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 21:58:14 +00:00
Nick Brassel
b8ac4dddb6
Fixup develop compiles. (#19828) 2023-02-13 08:57:23 +11:00
QMK Bot
eff1fa4536 Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 17:48:51 +00:00