Commit Graph

29777 Commits

Author SHA1 Message Date
QMK Bot
fecfb67f80 Merge remote-tracking branch 'origin/develop' into xap 2023-10-12 19:47:41 +00:00
QMK Bot
f4ed65169f Merge remote-tracking branch 'origin/master' into develop 2023-10-12 19:47:06 +00:00
Wilhelm Schuster
b630df1aa7
Reword mention of personal keymaps from PR checklist (#22258) 2023-10-13 06:46:28 +11:00
QMK Bot
1afebfa6b2 Merge remote-tracking branch 'origin/develop' into xap 2023-10-12 18:22:49 +00:00
QMK Bot
04b8159d17 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 18:22:12 +00:00
kisakey-luxury
999e721312
Kisakey (#22217)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-10-12 11:21:30 -07:00
QMK Bot
71d5bc4d44 Merge remote-tracking branch 'origin/develop' into xap 2023-10-12 08:14:00 +00:00
QMK Bot
28696197e5 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 08:13:24 +00:00
Duncan Sutherland
b5423b2e83
Add 60_iso_tsangan_split_bs_rshift Community Layout (#21812)
* add 60_(ansi|iso)_tsangan_split_bs_shift layouts

* shift to rshift

* remove 60_ansi_tsangan_split_bs_rshift

* Update layouts/default/60_iso_tsangan_split_bs_rshift/info.json
2023-10-12 01:12:50 -07:00
QMK Bot
822fac3509 Merge remote-tracking branch 'origin/develop' into xap 2023-10-12 05:38:42 +00:00
QMK Bot
a682a98ef3 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 05:38:07 +00:00
adam tombleson
f536646235
Add 62 key Dactyl Manuform (#21394)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-11 22:37:28 -07:00
QMK Bot
d7305828bd Merge remote-tracking branch 'origin/develop' into xap 2023-10-12 05:26:58 +00:00
Alin Marin Elena
007c0c1db4
Updates to mlego m65 (#20220)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-10-11 22:26:20 -07:00
QMK Bot
5eb5efb729 Merge remote-tracking branch 'origin/develop' into xap 2023-10-12 04:44:57 +00:00
QMK Bot
c72d661b93 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 04:44:23 +00:00
4pplet
ad4ecd6eb4
Add Ratio60 PCB (#21609)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2023-10-11 21:43:47 -07:00
QMK Bot
49059e9500 Merge remote-tracking branch 'origin/develop' into xap 2023-10-12 04:17:55 +00:00
QMK Bot
5e8a156222 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 04:17:13 +00:00
Agent Blu, 006
fa8940e5a6
Keyboard change blu/vimclutch to hardware revision B. (#22247)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-10-11 21:16:34 -07:00
QMK Bot
1abcce36c0 Merge remote-tracking branch 'origin/develop' into xap 2023-10-12 03:25:07 +00:00
QMK Bot
3c0f9599b7 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 03:24:28 +00:00
Duncan Sutherland
527790b000
add 60_(ansi|iso)_wkl* community layouts (#21811)
* add 60_(ansi|iso)_tsangan_wkl* layouts

* Update keymap.c

* `tsangan_wkl` to `wkl`

* update info.json

* split backspace changes

* Apply suggestions from code review
2023-10-11 20:23:50 -07:00
QMK Bot
ff90b243ee Merge remote-tracking branch 'origin/develop' into xap 2023-10-11 21:34:23 +00:00
ClicketySplit
ffcc54833d
Leeloo v2.1 revision 3 updates (#22236) 2023-10-11 14:33:38 -07:00
QMK Bot
e0947ee5cf Merge remote-tracking branch 'origin/develop' into xap 2023-10-11 21:10:34 +00:00
QMK Bot
e03afcb083 Merge remote-tracking branch 'origin/master' into develop 2023-10-11 21:09:56 +00:00
Josh Hinnebusch
db8b74f016
[Keyboard] Hineybush H101 (#22186)
* initial h101 commit

* update keymap and add via support

* update doc stuff

* readme typo

* updates

* add indicator LEDs, needs testing

* update readme

* update USB VID/PID to match VIA json

* Update keyboards/hineybush/h101/readme.md

* Update keyboards/hineybush/h101/keymaps/default/keymap.c

* Update keyboards/hineybush/h101/readme.md

* Update keyboards/hineybush/h101/keymaps/via/keymap.c

* updates from PR comments

* updates per PR comments

* idk why the folder is acting weird

* maybe this will fix it

* update to hopefully fix everything weird

* keycode fixes

* keymap updates
2023-10-11 14:09:17 -07:00
QMK Bot
c26ec8c138 Merge remote-tracking branch 'origin/develop' into xap 2023-10-11 07:07:49 +00:00
QMK Bot
47145a6ce8 Merge remote-tracking branch 'origin/master' into develop 2023-10-11 07:07:05 +00:00
Dasky
81e086b387
add missing gpio include for pointing motion pin (#22246) 2023-10-11 00:06:28 -07:00
QMK Bot
f55f6dede5 Merge remote-tracking branch 'origin/develop' into xap 2023-10-10 21:09:15 +00:00
QMK Bot
474a405606 Merge remote-tracking branch 'origin/master' into develop 2023-10-10 21:08:37 +00:00
jonylee@hfd
0650f783b5
[Keyboard] MonsGeek M3 (#20542)
* Add keybord monsgeek m3.

* Add keybord monsgeek m3.

* Add keybord monsgeek m3.

* updata rules.mk

* add readme.md

* delete monsgeek\m3\rgb_matrix_kb.inc

* add DISABLE_M3_KEYCODES

* user_config --> kb_config

* Move code to info.json,and removed redundant features

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/info.json

* Update readme.md

* Update keyboards/monsgeek/m3/config.h

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/keymaps/default/keymap.c

* Update keyboards/monsgeek/m3/keymaps/via/keymap.c

* Update keyboards/monsgeek/m3/readme.md

* Update m3.c

* Update m3.c

* Update info.json

* Update keymap.c

* Update keymap.c

* Update config.h

* Update keyboards/monsgeek/m3/readme.md

* Update keyboards/monsgeek/m3/rules.mk

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/keymaps/default/keymap.c

* Update keyboards/monsgeek/m3/keymaps/via/keymap.c

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/info.json

* Update m3.c

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/m3.c

* Update keymap.c

replace the tabs with spaces

* Update keymap.c

replace the tabs with spaces
2023-10-10 14:07:59 -07:00
QMK Bot
eabe1d34a3 Merge remote-tracking branch 'origin/develop' into xap 2023-10-10 00:42:54 +00:00
QMK Bot
17c7d1fac3 Merge remote-tracking branch 'origin/master' into develop 2023-10-10 00:42:16 +00:00
Arthur
6dafcac713
[Keyboard] Add MIIIW BlackIO83 (#21970)
* Add MIIIW BlackIO83

* Improve the code

* Updated instructions for entering the bootloader

* Update keyboards/miiiw/blackio83/rev_0100/config.h

* Update keyboards/miiiw/blackio83/rev_0100/config.h

* Update keyboards/miiiw/blackio83/config.h

* Update config.h
2023-10-09 17:41:40 -07:00
QMK Bot
228f93deae Merge remote-tracking branch 'origin/develop' into xap 2023-10-09 22:17:45 +00:00
QMK Bot
0e5f7ac3ba Merge remote-tracking branch 'origin/master' into develop 2023-10-09 22:17:19 +00:00
Joel Challis
81d69a5798
Resolve invalid keyboard alias targets (#22239) 2023-10-09 23:17:05 +01:00
Joel Challis
509a2b40b7
Fix old usage of UNICODE_MODE_MAC (#22238) 2023-10-09 23:16:54 +01:00
Dasky
77fe1298c7
Yampad add missing includes for CONVERT_TO (#22237) 2023-10-09 23:16:38 +01:00
Dasky
20eb93e05c
Yampad add missing includes for CONVERT_TO (#22237) 2023-10-09 23:16:21 +01:00
QMK Bot
0d1c0b229f Merge remote-tracking branch 'origin/develop' into xap 2023-10-09 19:51:52 +00:00
QMK Bot
683cdf3a43 Merge remote-tracking branch 'origin/master' into develop 2023-10-09 19:51:13 +00:00
HorrorTroll
3665ae0441
[Keyboard] HorrorTroll Nyx (#21143)
* Added support keyboard Nyx

* Resolved zvarc suggested and lint error

* Delete FORCE_NKRO due to problem with BIOS on mainboard

* Resolved dunk2k suggested and limit more brightness, disable some RGB Effect

* Resolved drashna suggested

* Delete flower blooming effect and move to rev1 folder
2023-10-09 12:50:33 -07:00
QMK Bot
50cde16aca Merge remote-tracking branch 'origin/develop' into xap 2023-10-09 16:41:39 +00:00
Dominik
fa1c1cbbee
avrdude: Version 7.2 changes the text output (#22235)
from "could not find USB device with" to "cannot find USB device with"
This should fix issue #22234

Co-authored-by: Dominik Loidolt <dominik.loidolt@univie.ac.at>
2023-10-09 17:41:00 +01:00
QMK Bot
4b70317ab1 Merge remote-tracking branch 'origin/develop' into xap 2023-10-09 08:38:58 +00:00
QMK Bot
e2e6b3dfd6 Merge remote-tracking branch 'origin/master' into develop 2023-10-09 08:38:22 +00:00