Commit Graph

16898 Commits

Author SHA1 Message Date
QMK Bot
9322963cbd Merge remote-tracking branch 'origin/develop' into xap 2023-06-05 06:00:14 +00:00
QMK Bot
83a726c30e Merge remote-tracking branch 'origin/master' into develop 2023-06-05 05:59:35 +00:00
Moritz Plattner
7b57c4ecf6
fixed E80 1800 layout macros (#21125) 2023-06-05 06:58:59 +01:00
QMK Bot
33d873957e Merge remote-tracking branch 'origin/develop' into xap 2023-06-04 01:49:52 +00:00
QMK Bot
2d09305445 Merge remote-tracking branch 'origin/master' into develop 2023-06-04 01:49:13 +00:00
Ramiro Bou
67b9f56f22
Fix USB PIDs on Churrosoft Deck-8 (#21126) 2023-06-04 02:48:29 +01:00
QMK Bot
1e2b75a886 Merge remote-tracking branch 'origin/develop' into xap 2023-06-04 01:12:08 +00:00
QMK Bot
220dad26d0 Merge remote-tracking branch 'origin/master' into develop 2023-06-04 01:11:30 +00:00
mechlovin
698e31a2b0
[Keyboard] Zed65 Rev.1 - Update info.json (#21122) 2023-06-04 02:10:53 +01:00
QMK Bot
d99511475f Merge remote-tracking branch 'origin/develop' into xap 2023-06-03 20:41:06 +00:00
QMK Bot
ce94daf3d8 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 20:39:49 +00:00
QMK Bot
caa354fa76 Merge remote-tracking branch 'origin/develop' into xap 2023-06-03 20:39:35 +00:00
Guido Bartolucci
23a9d1ffc7
[Keyboard] Add Andean Condor (#21118)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-03 14:39:13 -06:00
QMK Bot
a3c58ba567 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 20:38:54 +00:00
Ramiro Bou
f6bbd4d2c5
[Keyboard] Add Churrosoft Deck-8 (#21119)
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-03 14:38:09 -06:00
QMK Bot
ec487ab958 Merge remote-tracking branch 'origin/develop' into xap 2023-06-03 07:05:03 +00:00
QMK Bot
7d676f1aa6 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 07:04:21 +00:00
mechlovin
f4a608255a
[Keyboard] Add the Zed65 rev.1 PCB (#21043)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-03 01:03:45 -06:00
QMK Bot
fd964f16fa Merge remote-tracking branch 'origin/develop' into xap 2023-06-02 07:47:21 +00:00
QMK Bot
ef788c68f4 Merge remote-tracking branch 'origin/master' into develop 2023-06-02 07:46:36 +00:00
yiancar
ae5bcaac0d
[keyboard] Phoenix (#21051)
* Update keyboards/cablecardesigns/phoenix/
2023-06-02 08:45:54 +01:00
QMK Bot
99e52f962d Merge remote-tracking branch 'origin/develop' into xap 2023-06-01 16:25:50 +00:00
Ryan
a4ed6ad0f5
Unicodemap keycodes rename (#21092) 2023-06-01 17:25:08 +01:00
QMK Bot
b3288fbd73 Merge remote-tracking branch 'origin/develop' into xap 2023-06-01 14:12:12 +00:00
QMK Bot
45c9bc4e55 Merge remote-tracking branch 'origin/master' into develop 2023-06-01 14:11:31 +00:00
DeskDaily
b110a09886
[Keyboard] Add lightweight65 keyboard (#21034)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2023-06-01 07:10:47 -07:00
QMK Bot
de45dc9f05 Merge remote-tracking branch 'origin/develop' into xap 2023-06-01 09:27:28 +00:00
QMK Bot
857e9b74d6 Merge remote-tracking branch 'origin/master' into develop 2023-06-01 09:26:41 +00:00
Sergi Meseguer
c805c10672
[Keymap] z12 zigotica keymap tweaks (#20990) 2023-06-01 02:25:49 -07:00
QMK Bot
863489e759 Merge remote-tracking branch 'origin/develop' into xap 2023-05-31 19:04:20 +00:00
QMK Bot
6156972781 Merge remote-tracking branch 'origin/master' into develop 2023-05-31 19:03:39 +00:00
kkokdae
81bc0925e9
[Keymap] Modify kkokdae keymap for keyboardio/atreus (#21037) 2023-05-31 12:02:58 -07:00
QMK Bot
95b86ba072 Merge remote-tracking branch 'origin/develop' into xap 2023-05-31 18:49:55 +00:00
3araht
5a26e5e790
[Keymap] transpose added to giabalanai keymaps (#21054) 2023-05-31 11:48:56 -07:00
QMK Bot
66f8330c76 Merge remote-tracking branch 'origin/develop' into xap 2023-05-31 18:48:42 +00:00
CoffeeIsLife
c2ddd77e0d
[Keymap] Cleanup coffeeislife87 keymap and remove features (#21061)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Fae <faenkhauser@gmail.com>
2023-05-31 11:46:59 -07:00
QMK Bot
5ce128651c Merge remote-tracking branch 'origin/develop' into xap 2023-05-31 18:45:25 +00:00
Drashna Jaelre
3a3e5abac9
[Keymap] Drashna Keymap updates for 0.21.0 (#21073) 2023-05-31 11:44:06 -07:00
QMK Bot
1d3ada3b5b Merge remote-tracking branch 'origin/develop' into xap 2023-05-28 03:39:08 +00:00
Nick Brassel
8c9f54d70b
Encoder map: NUM_DIRECTIONS (#21066) 2023-05-28 13:38:24 +10:00
QMK Bot
dfb4298210 Merge remote-tracking branch 'origin/develop' into xap 2023-05-27 13:13:19 +00:00
nuess0r
f98f8eedf0
Consolidate modelm v2 (#14996)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-05-27 23:12:36 +10:00
QMK Bot
bcd5e98bfd Merge remote-tracking branch 'origin/develop' into xap 2023-05-27 04:50:36 +00:00
Nick Brassel
e759230706
Fix up keebio/cepstrum (#21062) 2023-05-27 05:49:57 +01:00
QMK Bot
f42d4a10d9 Merge remote-tracking branch 'origin/develop' into xap 2023-05-27 02:28:26 +00:00
Ryan
363bfdbfda
Move RGBLIGHT_LIMIT_VAL to data driven (#20974)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-05-27 12:27:44 +10:00
QMK Bot
5e7448ade1 Merge remote-tracking branch 'origin/develop' into xap 2023-05-25 22:08:26 +00:00
Joel Challis
b2e5017e74
Move thekey to Drop vendor folder (#21032) 2023-05-25 23:08:12 +01:00
QMK Bot
98f9bd2eab Merge remote-tracking branch 'origin/develop' into xap 2023-05-25 15:41:48 +00:00
Drashna Jaelre
ed69d78f27
[Bug][Keyboard] Fix key display on Corne OLED (#21044) 2023-05-25 16:41:12 +01:00