Commit Graph
2439 Commits
Author SHA1 Message Date
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
Joel Challis 1d0b4c8d38 Tidy up use of keycode range helpers (#19756) 2023-02-10 21:10:14 +00:00
QMK Bot 90ce570be6 Merge remote-tracking branch 'origin/develop' into xap 2023-02-10 21:09:37 +00:00
Joel Challis 2ffdec5dc2 Move more unicode ranges to DD (#19755) 2023-02-10 21:08:54 +00:00
QMK Bot d2d640a6c8 Merge remote-tracking branch 'origin/develop' into xap 2023-02-02 03:32:31 +00:00
49c912f9b4 QP: Correct rotation and offset when using LVGL (#19713)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-02 14:31:54 +11:00
QMK Bot 46ce115e6f Merge remote-tracking branch 'origin/develop' into xap 2023-01-30 20:40:50 +00:00
Joel Challis d84a7351ea Strip out more of config_common (#19722) 2023-01-30 20:40:12 +00:00
QMK Bot 1d1b1e621b Merge remote-tracking branch 'origin/develop' into xap 2023-01-30 19:04:14 +00:00
Nick Brassel f6dd8dea2e Remove usages of config_common.h from config.h files. (#19714) 2023-01-31 06:03:30 +11:00
QMK Bot c694bb7ec6 Merge remote-tracking branch 'origin/develop' into xap 2023-01-30 18:37:56 +00:00
Ryan 2d843088a2 Normalise Swap Hands keycodes (#19720) 2023-01-30 18:37:19 +00:00
QMK Bot f015282a05 Merge remote-tracking branch 'origin/develop' into xap 2023-01-30 07:48:24 +00:00
Ryan 242b80c63f Move MIDI code out of tmk_core (#19704) 2023-01-30 18:47:50 +11:00
QMK Bot 4ad663af8d Merge remote-tracking branch 'origin/develop' into xap 2023-01-30 04:11:14 +00:00
Joel Challis 968cc1fe7b Relocate diode direction definitions (#19715) 2023-01-30 15:10:40 +11:00
QMK Bot 987a48e87d Merge remote-tracking branch 'origin/develop' into xap 2023-01-29 16:44:50 +00:00
Ryan 043d8e1140 Remove deprecated Quantum keycodes (#19712) 2023-01-29 16:44:16 +00:00
QMK Bot 32aad1f987 Merge remote-tracking branch 'origin/develop' into xap 2023-01-28 21:08:25 +00:00
Joel Challis 8cc2e0e906 Fix quantum ring_buffer for ChibiOS (#19683) 2023-01-28 21:07:51 +00:00
Nick Brassel 33e8e63e74 Merge remote-tracking branch 'upstream/develop' into xap 2023-01-25 11:24:52 +11:00
Nick Brassel ea05045923 Allow overriding of keymap/encodermap layer count. (#19325) 2023-01-24 07:10:03 +11:00
QMK Bot f202d4a291 Merge remote-tracking branch 'origin/develop' into xap 2023-01-20 16:21:59 +00:00