Commit Graph
2461 Commits
Author SHA1 Message Date
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
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 YandDrashna Jaelre 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
Drashna JaelreandRyan b47f179a4a Make Magic handling more consistent in Action Keycode handling (#9126)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-13 04:48:14 +11:00
QMK Bot 94b268eca2 Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 17:10:14 +00:00
Joel Challis 6ceff1367d Tidy up use of keycode range helpers (#19813) 2023-02-12 17:09:34 +00:00
QMK Bot 227bfbc168 Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 16:39:13 +00:00
3ae87b1555 core: allow locking the matrix state (#18852)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-13 03:38:36 +11:00
QMK Bot ad6011226a Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 16:31:40 +00:00
db1eeea478 Add combo hook to allow per layer combo reference layers. (#16699)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-02-13 03:31:04 +11:00
QMK Bot 9c9a55199d Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 16:19:43 +00:00
RyanandDrashna Jaelre bbf7a20b33 Refactor Leader key feature (#19632)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-13 03:19:02 +11:00
QMK Bot 261c938fd4 Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 15:56:36 +00:00
Joel Challis d10350cd2c Restore packing of midi note keycodes (#19468) 2023-02-13 02:55:51 +11:00
QMK Bot 1db19d19ca Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 06:15:09 +00:00
Sergey VlasovandJoel Challis 584b7cf801 Fix build failures with OPT = 0 due to inline functions (#19767)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-12 17:14:34 +11:00
QMK Bot c5fc65df83 Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 06:07:41 +00:00
Drashna Jaelre b1f4d49c43 [Bug] Fix tri layer compiler issue if NO_ACTION_LAYER is defined (#19821) 2023-02-12 17:07:01 +11:00
QMK Bot 57d932bbfa Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 02:40:58 +00:00
jack 9c6942ea40 Remove config.h include from quantum files (#19817) 2023-02-12 02:40:16 +00:00
QMK Bot 7faa82869c Merge remote-tracking branch 'origin/develop' into xap 2023-02-11 23:23:46 +00:00
fe02abc479 [Core] Tri Layer Keys (#19795)
Co-authored-by: wilba <wilba@wilba.tech>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-12 10:23:07 +11:00
QMK Bot 151c24cfc6 Merge remote-tracking branch 'origin/develop' into xap 2023-02-11 03:48:25 +00:00
Joel Challis 11d49d00e7 Remove matrix_init_quantum/matrix_scan_quantum (#19806) 2023-02-11 03:47:17 +00:00
QMK Bot 327aaae1ba Merge remote-tracking branch 'origin/develop' into xap 2023-02-10 21:10:50 +00:00