Commit Graph

15175 Commits

Author SHA1 Message Date
QMK Bot
5f3b853293 Merge remote-tracking branch 'origin/develop' into xap 2023-01-08 15:28:19 +00:00
QMK Bot
cf55032485 Merge remote-tracking branch 'origin/master' into develop 2023-01-08 15:27:43 +00:00
Joel Challis
1c024bfa91
Add some missing layout data (#19539) 2023-01-08 15:26:37 +00:00
QMK Bot
9115ddfedb Merge remote-tracking branch 'origin/develop' into xap 2023-01-07 17:06:28 +00:00
Joel Challis
974a1eaf2a
Ignore defaults.hjson values if already set (#19511)
* Ignore defaults.hjson values if already set

* Add warning when nothing is merged
2023-01-07 17:05:53 +00:00
QMK Bot
0c444ab568 Merge remote-tracking branch 'origin/develop' into xap 2023-01-07 17:03:56 +00:00
QMK Bot
403c7eeb5c Merge remote-tracking branch 'origin/master' into develop 2023-01-07 17:03:18 +00:00
Joel Challis
c5e3275299
Fix handwired/onekey/kb2040 WS2812 pin (#19517) 2023-01-07 17:02:40 +00:00
QMK Bot
1fb3f7d208 Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 06:19:53 +00:00
QMK Bot
8b141020b2 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 06:18:53 +00:00
SapuSeven
6a02eb2874
Add SapuSeven MacroPad12 (#19466)
* Add SapuSeven MacroPad12

* Update image url

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove unnecessary layers

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-01-04 06:18:16 +00:00
QMK Bot
16c0f233f9 Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 05:22:11 +00:00
QMK Bot
b6b9b25525 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 05:21:35 +00:00
Carlo
be024a1d43
feat(kprepublic/bm60hsrgb_poker): update carlosala keymap (#19426) 2023-01-04 05:21:32 +00:00
Paul James
04dcf81d1e
[Keyboard] Stop LED1 from flashing on layer change (#19427) 2023-01-04 05:21:03 +00:00
QMK Bot
bbd783250d Merge remote-tracking branch 'origin/develop' into xap 2023-01-02 22:52:39 +00:00
QMK Bot
44800f119d Merge remote-tracking branch 'origin/master' into develop 2023-01-02 22:52:06 +00:00
Jesus Climent
5962ebaba1
Fix github URL for the atreyu maintainer. (#19476) 2023-01-03 09:51:32 +11:00
QMK Bot
1871d01c18 Merge remote-tracking branch 'origin/develop' into xap 2023-01-02 22:13:33 +00:00
QMK Bot
b497d58d6d Merge remote-tracking branch 'origin/master' into develop 2023-01-02 22:13:00 +00:00
Joel Challis
975d64cc2b
adpenrose/akemipad fixes (#19477) 2023-01-03 09:12:25 +11:00
QMK Bot
74bc20675a Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 16:07:16 +00:00
QMK Bot
17085ec49d Merge remote-tracking branch 'origin/master' into develop 2023-01-01 16:06:35 +00:00
Byron Clark
867e4fc11c
[Keyboard] Add community layout support to Piantor (#19455) 2023-01-01 08:05:57 -08:00
QMK Bot
b7e9623995 Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 01:00:24 +00:00
QMK Bot
03ec3db651 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:57:59 +00:00
Drashna Jaelre
9b8f18699f
Partially revert #18940 for Ploopy Thumb Trackball (#18943) 2023-01-01 11:57:36 +11:00
Drashna Jaelre
b4d5c22ed4
Keyboard/fix work louder micro (#18968) 2023-01-01 11:57:15 +11:00
QMK Bot
5fc0209c22 Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 00:55:48 +00:00
Drashna Jaelre
ac561b9473
[Bug] Prevent dynamic keymaps from processing layers that don't exist (#19225) 2023-01-01 11:55:14 +11:00
QMK Bot
a95633336a Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 00:54:23 +00:00
Joel Challis
d0ebafaea6
Align definition of unicode_map (#19452) 2023-01-01 11:54:12 +11:00
QMK Bot
a4ff41a6ce Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 00:43:30 +00:00
QMK Bot
c6bc439eb2 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:42:58 +00:00
TommyZ
c7c44de32f
[Keyboard] Add Quarkeys Z60, reorganized keyboard file directory (#19404)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-01-01 11:41:58 +11:00
QMK Bot
e98e1912be Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 00:41:22 +00:00
QMK Bot
22b3d76f9b Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:40:34 +00:00
QMK Bot
45379538b3 Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 00:40:07 +00:00
DOIO2022
53100496c3
Add KB30 keyboard (#19395)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-01-01 11:40:01 +11:00
QMK Bot
06b12a98c7 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:39:31 +00:00
Jesus Climent
20bafb9313
Atreyu rev2 (#19443) 2023-01-01 11:38:44 +11:00
QMK Bot
2d1cc7b6ec Merge remote-tracking branch 'origin/develop' into xap 2022-12-31 21:16:01 +00:00
jack
829c7e0931
Fixup horrortroll/handwired_k552 (#19447) 2022-12-31 21:15:16 +00:00
QMK Bot
347b62261f Merge remote-tracking branch 'origin/develop' into xap 2022-12-30 01:04:33 +00:00
HorrorTroll
724aa3a4b2
Refactor entire Handwired K552 keyboard (#18066) 2022-12-30 12:04:01 +11:00
QMK Bot
e26bbddc09 Merge remote-tracking branch 'origin/develop' into xap 2022-12-30 01:02:44 +00:00
QMK Bot
87cace28a6 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 01:02:09 +00:00
Yizhen Liu
590c889537
[keyboard]Add Graystudio Space65 R3 (#18909)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-30 12:01:32 +11:00
QMK Bot
09f944b0e7 Merge remote-tracking branch 'origin/develop' into xap 2022-12-30 01:01:04 +00:00
QMK Bot
7cccba8a3b Merge remote-tracking branch 'origin/master' into develop 2022-12-30 01:00:29 +00:00