Commit Graph

354 Commits

Author SHA1 Message Date
zvecr
751e72c1f9 Fix xap_client gen after render_xap_output changes 2023-03-06 19:56:38 +00:00
QMK Bot
c0740cf08a Merge remote-tracking branch 'origin/develop' into xap 2023-03-05 23:09:02 +00:00
Joel Challis
500c4b7484
Reject VIA keys within info.json (#20026) 2023-03-06 10:07:47 +11:00
QMK Bot
809260d39a Merge remote-tracking branch 'origin/develop' into xap 2023-02-25 21:38:39 +00:00
Ryan
314f6c1ddb
Move backlight config to data driven (#19910) 2023-02-26 08:37:57 +11: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
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
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
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
5cd8627002 Merge remote-tracking branch 'origin/develop' into xap 2023-02-18 05:27:25 +00:00
pauper
7ce71625bc
[Keyboard] Brick (#19851)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Jason Chestnut <jason@Jasons-MacBook-Pro.local>
2023-02-17 21:26:43 -08:00
QMK Bot
fbe581fe82 Merge remote-tracking branch 'origin/develop' into xap 2023-02-12 23:02:42 +00:00
Joel Challis
896d9aa98c
Add rp2040_ce and add elite-pi and helios as alias (#19830)
* add rp2040_ce and add elite-pi and helios as alias (#19628)

* fix git mishap

* Update platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h

Co-authored-by: Joel Challis <git@zvecr.com>

---------

Co-authored-by: Joel Challis <git@zvecr.com>

* Tidy docs

---------

Co-authored-by: Conor Burns <mail@conor-burns.com>
2023-02-12 23:02:05 +00: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
7faa82869c Merge remote-tracking branch 'origin/develop' into xap 2023-02-11 23:23:46 +00:00
Drashna Jaelre
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
dad5a9ac4b Merge remote-tracking branch 'origin/develop' into xap 2023-02-11 02:46:27 +00:00
Nick Brassel
9991894514
Generate encodermap output from keymap.json. (#18915)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-11 13:45:51 +11: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
a37182dac8 Merge remote-tracking branch 'origin/develop' into xap 2023-02-09 19:28:13 +00:00
miguelelinventor
e24f9b2c0a
Add Michi MCU Converter support (#19163) 2023-02-09 11:27:37 -08:00
QMK Bot
40a90539ca Merge remote-tracking branch 'origin/develop' into xap 2023-02-09 03:06:01 +00:00
Ramon Imbao
df3c9a5401
Rename ramonimbao folder to rmi_kb (#19699)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-08 20:05:21 -07: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
be9c13dcf9 Merge remote-tracking branch 'origin/develop' into xap 2023-01-19 00:27:37 +00:00
Joel Challis
0b25528b6b
Fix 'No LAYOUTs defined' check (#19537) 2023-01-19 00:27:11 +00:00
Joel Challis
0ce3f6bcfe
De-duplicate platform detection (#19603) 2023-01-19 00:27:00 +00:00
QMK Bot
14a138f48e Merge remote-tracking branch 'origin/develop' into xap 2023-01-15 15:05:09 +00:00
Joel Challis
0730740add
Add mmoskal/uf2-stm32f103 bootloader support (#19594) 2023-01-15 15:04:32 +00:00
Nick Brassel
03c47d295e
Jinja2 cleanup. 2023-01-14 15:37:07 +11:00
QMK Bot
8de3e044b6 Merge remote-tracking branch 'origin/develop' into xap 2023-01-11 19:59:08 +00:00
Joel Challis
46c85c93f0
Revert "De-duplicate platform detection (#19545)" (#19564)
This reverts commit e11235ee14.
2023-01-11 19:58:27 +00:00
QMK Bot
6347b11704 Merge remote-tracking branch 'origin/develop' into xap 2023-01-11 02:14:11 +00:00
Joel Challis
e11235ee14
De-duplicate platform detection (#19545) 2023-01-11 02:13:32 +00:00
QMK Bot
b3c8b8482f Merge remote-tracking branch 'origin/develop' into xap 2023-01-09 09:23:40 +00:00
Joel Challis
a3ed1b0c8d
Relax converter within keymap schema (#19544) 2023-01-09 09:23:02 +00:00
QMK Bot
44eb74bb74 Merge remote-tracking branch 'origin/develop' into xap 2023-01-07 17:08:48 +00:00
QMK Bot
c172ae107e Merge remote-tracking branch 'origin/master' into develop 2023-01-07 17:07:51 +00:00
Joel Challis
f6023a36bc
Remove invalid pin_compatible config from defaults (#19512) 2023-01-07 17:07:19 +00:00
QMK Bot
905b1fc71c Merge remote-tracking branch 'origin/develop' into xap 2022-12-23 23:43:09 +00:00
Joel Challis
517f8af99e
Revert changes to keymap_steno.h (#19412) 2022-12-23 23:42:33 +00:00