Commit Graph

19759 Commits

Author SHA1 Message Date
QMK Bot
82e8125ad5 Merge remote-tracking branch 'origin/develop' into xap 2024-06-16 18:17:06 +00:00
QMK Bot
fca1417f6b Merge remote-tracking branch 'origin/master' into develop 2024-06-16 18:16:33 +00:00
Danny
751fbd75d3
Add Chiri CE (#23926)
* Add Chiri CE

* Add more layers for dynamic keymap

* Move EEPROM clear

* Convert to keymap.json

* Change bootmagic matrix position
2024-06-16 12:16:05 -06:00
QMK Bot
2dcd286242 Merge remote-tracking branch 'origin/develop' into xap 2024-06-16 12:53:50 +00:00
QMK Bot
1317a0732b Merge remote-tracking branch 'origin/master' into develop 2024-06-16 12:53:18 +00:00
Ryan
3c868b9316
ergodox_ez/base: Add missing features object (#23935) 2024-06-16 22:52:47 +10:00
QMK Bot
5adae0d377 Merge remote-tracking branch 'origin/develop' into xap 2024-06-16 04:47:24 +00:00
QMK Bot
c43667fa74 Merge remote-tracking branch 'origin/master' into develop 2024-06-16 04:46:54 +00:00
David Hoelscher
ad82c4703a
[Keyboard] ErgoStrafer RGB (#22936)
* adding ergostrafer rgb

* removing comment
2024-06-15 21:46:22 -07:00
QMK Bot
a7e91b0b6e Merge remote-tracking branch 'origin/develop' into xap 2024-06-14 21:59:15 +00:00
QMK Bot
e31418ee11 Merge remote-tracking branch 'origin/master' into develop 2024-06-14 21:58:43 +00:00
Ryan
d4654ab893
Various keyboard fixes (#23919) 2024-06-14 22:58:13 +01:00
QMK Bot
368dde308d Merge remote-tracking branch 'origin/develop' into xap 2024-06-14 20:27:00 +00:00
QMK Bot
0c8a968e3d Merge remote-tracking branch 'origin/master' into develop 2024-06-14 20:26:31 +00:00
ai03
aec7569a04
[Keyboard] Add Altair (#23878)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2024-06-14 13:26:21 -07:00
ai03
0594121b68
[Keyboard] Add Altair-X (#23879)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2024-06-14 13:26:00 -07:00
QMK Bot
6a19109b31 Merge remote-tracking branch 'origin/develop' into xap 2024-06-14 07:35:45 +00:00
QMK Bot
a2f2de7d2c Merge remote-tracking branch 'origin/master' into develop 2024-06-14 07:34:37 +00:00
Myriam
4e8b740dd7
fix keymap for kprepublic bm60hsrgb_iso (#23733)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-06-14 00:34:06 -07:00
QMK Bot
3f962afff3 Merge remote-tracking branch 'origin/develop' into xap 2024-06-14 04:11:28 +00:00
QMK Bot
4f8aab748b Merge remote-tracking branch 'origin/master' into develop 2024-06-14 04:10:54 +00:00
adophoxia
c92becc57e
[Keyboard] Enable dip switch for Keychron Q4 (#23889) 2024-06-13 21:10:23 -07:00
QMK Bot
1f56059991 Merge remote-tracking branch 'origin/develop' into xap 2024-06-13 22:37:24 +00:00
QMK Bot
a98aa70f80 Merge remote-tracking branch 'origin/master' into develop 2024-06-13 22:36:55 +00:00
Danny
caf13bb9db
Fix order of RGB LEDs to correct one for Iris CE (#23914) 2024-06-13 15:36:26 -07:00
QMK Bot
d249e3d4fa Merge remote-tracking branch 'origin/develop' into xap 2024-06-13 13:01:43 +00:00
QMK Bot
248a09d545 Merge remote-tracking branch 'origin/master' into develop 2024-06-13 13:01:12 +00:00
Danny
4a4eda4c3c
Add missing encode enable for BAMFK-1 (#23821)
Add missing encode enable
2024-06-13 09:00:42 -04:00
QMK Bot
70e5c25b8e Merge remote-tracking branch 'origin/develop' into xap 2024-06-12 07:45:35 +00:00
QMK Bot
52b4058ca4 Merge remote-tracking branch 'origin/master' into develop 2024-06-12 07:44:58 +00:00
Nick Brassel
bdd10ef8e7
Remove VIA_ENABLE from default keymaps. (#23903) 2024-06-12 17:43:09 +10:00
QMK Bot
aa66319e05 Merge remote-tracking branch 'origin/develop' into xap 2024-06-12 07:12:50 +00:00
QMK Bot
c785584fa5 Merge remote-tracking branch 'origin/master' into develop 2024-06-12 07:12:20 +00:00
4pplet
031ca3b40b
[Keyboard] Fix settings for 4pplet/waffling60 (#23862) 2024-06-12 00:11:50 -07:00
QMK Bot
a8bb48830b Merge remote-tracking branch 'origin/develop' into xap 2024-06-11 03:26:19 +00:00
Ryan
354a2e40cf
splitkb/kyria: remove CONVERT_TO at keyboard level (#23857) 2024-06-11 13:25:51 +10:00
QMK Bot
e2a6f76cca Merge remote-tracking branch 'origin/develop' into xap 2024-06-09 20:16:12 +00:00
QMK Bot
d4f8b478aa Merge remote-tracking branch 'origin/master' into develop 2024-06-09 20:15:38 +00:00
Ryan
df4538d894
Fix Iris/Irispad keymaps (#23856) 2024-06-09 13:14:48 -07:00
QMK Bot
7e55bbaee2 Merge remote-tracking branch 'origin/develop' into xap 2024-06-09 19:48:49 +00:00
QMK Bot
c6ecb9ce41 Merge remote-tracking branch 'origin/master' into develop 2024-06-09 19:48:19 +00:00
Alabahuy
e484a3a179
[Keyboard] add jaykeeb jk60 (#23876) 2024-06-09 12:47:48 -07:00
QMK Bot
d7367f907d Merge remote-tracking branch 'origin/develop' into xap 2024-06-09 17:57:36 +00:00
フィルターペーパー
4926f0de8b
[Keyboard] Fixup mt/mt84 (#23883) 2024-06-09 10:57:08 -07:00
QMK Bot
eb839b45c7 Merge remote-tracking branch 'origin/develop' into xap 2024-06-07 01:18:20 +00:00
QMK Bot
d12f090d1e Merge remote-tracking branch 'origin/master' into develop 2024-06-07 01:17:50 +00:00
Syenasweta a.k.a. Nashrullah Ali Fauzi
950d765370
Add SyenaKeyboards Elaruus (#23870)
* add syenakeyboard elaruus

* add syenakeyboards elaruus

* add syenakeyboards elaruus

* add syenakeyboards elaruus

* add syenakeyboards/elaruus

* add syenakeyboards elaruus

* add syenakeyboards elaruus

* add syenakeyboards elaruus

* Update keyboards/syenakeyboards/elaruus/keyboard.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update keyboards/syenakeyboards/elaruus/keymaps/default/keymap.c

Co-authored-by: jack <0x6a73@protonmail.com>

* Update keyboards/syenakeyboards/elaruus/keymaps/via/keymap.c

Co-authored-by: jack <0x6a73@protonmail.com>

---------

Co-authored-by: Syenasweta <syenasweta@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2024-06-06 19:17:21 -06:00
QMK Bot
7fb6ba3c09 Merge remote-tracking branch 'origin/develop' into xap 2024-06-05 02:21:56 +00:00
QMK Bot
0d360b64fa Merge remote-tracking branch 'origin/master' into develop 2024-06-05 02:21:27 +00:00
Nick Brassel
a4da5f219f
Fixup build failures. (#23869) 2024-06-05 12:20:57 +10:00