Commit Graph

30534 Commits

Author SHA1 Message Date
QMK Bot
b75e4efc19 Merge remote-tracking branch 'origin/develop' into xap 2023-12-23 07:48:54 +00:00
user176176
92d7b8cb54
[Keyboard] null ST110R2.1 (SaikouType) (#21623)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: user176176 <you@example.com>
2023-12-22 23:48:27 -08:00
QMK Bot
7980473e6c Merge remote-tracking branch 'origin/develop' into xap 2023-12-22 03:39:29 +00:00
Drashna Jaelre
29f8fa35cf
[Audio] Enable Complementary output for PWM Hardware driver (#22726)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-12-21 19:38:59 -08:00
QMK Bot
c10b36ff2d Merge remote-tracking branch 'origin/develop' into xap 2023-12-21 12:31:57 +00:00
QMK Bot
9069c4540f Merge remote-tracking branch 'origin/master' into develop 2023-12-21 12:31:24 +00:00
Tom Barnes
5031e0e35c
[docs] - reword PR checklist for vendor keymaps/userspace changes (#22725)
* reword PR checklist for vendor keymaps/userspace changes

* clarify vendor keymaps slightly

* delete layout macro related line
2023-12-21 12:30:55 +00:00
QMK Bot
7fbae29d87 Merge remote-tracking branch 'origin/develop' into xap 2023-12-21 00:25:24 +00:00
Jesse Leventhal
088853dd22
[Keyboard] Updating NCC1701KB (#22721) 2023-12-20 16:24:54 -08:00
QMK Bot
41581b737c Merge remote-tracking branch 'origin/develop' into xap 2023-12-20 22:33:21 +00:00
QMK Bot
6fbd79ce4e Merge remote-tracking branch 'origin/master' into develop 2023-12-20 22:32:49 +00:00
Nick Brassel
2661ee282a
[Bugfix] Manipulate deferred executor slot only if tokens match (#22722) 2023-12-21 09:32:19 +11:00
QMK Bot
7a5597bac0 Merge remote-tracking branch 'origin/develop' into xap 2023-12-20 22:03:35 +00:00
QMK Bot
e80f5de78c Merge remote-tracking branch 'origin/master' into develop 2023-12-20 22:02:55 +00:00
Nick Brassel
3afa2a9439
[Keymap Removal] Restore mechboards mb_via keymaps. (#22723) 2023-12-21 09:02:22 +11:00
QMK Bot
87daca9be5 Merge remote-tracking branch 'origin/develop' into xap 2023-12-20 05:04:14 +00:00
fauxpark
2c191e21c2 Merge remote-tracking branch 'upstream/master' into develop 2023-12-20 16:03:14 +11:00
QMK Bot
af47268f11 Merge remote-tracking branch 'origin/develop' into xap 2023-12-20 02:32:16 +00:00
Ryan
8812a09581
Rename RGB_DISABLE_WHEN_USB_SUSPENDED -> RGB_MATRIX_SLEEP (#22682) 2023-12-20 13:31:50 +11:00
Ryan
73758d3d3a
Rename LED_DISABLE_WHEN_USB_SUSPENDED -> LED_MATRIX_SLEEP (#22681) 2023-12-20 13:31:39 +11:00
フィルターペーパー
c8728880de
takashicompany: readme link correction (#22711)
Updated Github link
2023-12-19 13:54:32 -07:00
Pham Duc Minh
2ce2fa6d06
[Keyboard] Add Deemen17 DE60FS (#22667)
* Add de60fs

* Update

* Add image

* Add line break for rules.mk

* Update keyboards/deemen17/de60fs/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Update keyboards/deemen17/de60fs/info.json

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Remove readme of keymap folder

* Change to KC_RSFT

* Add Community Layout support

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/deemen17/de60fs/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/deemen17/de60fs/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/deemen17/de60fs/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Add description in readme

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-18 17:02:47 -07:00
Joel Challis
c9d90db95c
[Keymap Removal] xiudi/xd75 and related keymaps. (#22698) 2023-12-19 09:02:03 +11:00
Joel Challis
1b75a84a39
[Keymap Removal] tada68 and related keymaps. (#22699) 2023-12-19 08:56:52 +11:00
Joel Challis
fc4e6c61a4
[Keymap Removal] Restore splitkb 'debug' keymaps (#22700) 2023-12-19 08:55:36 +11:00
QMK Bot
d23bfbfa3a Merge remote-tracking branch 'origin/develop' into xap 2023-12-18 20:13:37 +00:00
Ryan
b9e81c0691
Update keyboard LED driver configs (#22638) 2023-12-18 20:13:08 +00:00
Nick Brassel
a1c8b1ebf7
Remove obvious user keymaps, keyboards/{d,e,f}* edition. (#22695) 2023-12-18 21:45:52 +11:00
Nick Brassel
d235352504
Remove obvious user keymaps, keyboards/{b,c}* edition. (#22693) 2023-12-18 16:05:50 +11:00
Nick Brassel
f25226453f
Remove obvious user keymaps, keyboards/a* edition. (#22692) 2023-12-18 14:06:47 +11:00
Nick Brassel
9539f135d8
Remove obvious user keymaps, keyboards/[0-9]* edition. (#22691) 2023-12-18 13:53:02 +11:00
Joel Challis
27a710861e
[Keymap Removal] Preonic and related keymaps. (#22689) 2023-12-18 12:51:24 +11:00
DOIO2022
1556a2ed0e
[Keyboard] Add doio KB19 (#22393)
* Add files via upload

* Update keyboards/doio/kb3x/config.h

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

* Update keyboards/doio/kb3x/info.json

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

* Update keyboards/doio/kb3x/keymaps/via/keymap.c

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

* Update keyboards/doio/kb3x/config.h

Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>

* Update keyboards/doio/kb3x/keymaps/default/keymap.c

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

* Update rules.mk

* Update info.json

* Update keyboards/doio/kb3x/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/doio/kb3x/rules.mk

Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>

* Add files via upload

* Update keyboards/doio/kb3x/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/doio/kb3x/config.h

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Delete keyboards/doio/kb3x/rules.mk

* Update keyboards/doio/kb3x/keymaps/default/keymap.c

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

* Update keyboards/doio/kb3x/keymaps/via/keymap.c

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

* Add KB19

* Delete keyboards/doio/kb3x directory

* format  info.json

* format info.json

* Create rules.mk

* Update rules.mk

* Update keyboards/doio/kb19/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update info.json

* Update keymap.c

* Update keymap.c

* Delete keyboards/doio/kb19/config.h

* Update keyboards/doio/kb19/keymaps/via/keymap.c

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

* Update keyboards/doio/kb19/keymaps/default/keymap.c

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

---------

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-17 18:51:14 -07:00
QMK Bot
17f1be7a68 Merge remote-tracking branch 'origin/develop' into xap 2023-12-18 01:50:19 +00:00
QMK Bot
62db54dc32 Merge remote-tracking branch 'origin/master' into develop 2023-12-18 01:49:49 +00:00
Joel Challis
990895f03f
[Keymap Removal] keebio/iris and related keymaps. (#22690) 2023-12-18 12:49:19 +11:00
QMK Bot
14fb93d663 Merge remote-tracking branch 'origin/develop' into xap 2023-12-17 18:51:41 +00:00
QMK Bot
e27034f800 Merge remote-tracking branch 'origin/master' into develop 2023-12-17 18:51:13 +00:00
Ivan Gromov
54200b7b82
[Keyboard] Add Diablo (#22414)
* Create keymap.c

* Create keymap.c

* Create rules.mk

* Add files via upload

* Create keymap.c

* Create keymap.c

* Create rules.mk

* Add files via upload

* Update keymap.c

* Update keymap.c

* Update keyboards/keyten/diablo/keymaps/default/keymap.c

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

* Delete keyboards/keyten/kt60hs_t directory

* Update keyboards/keyten/diablo/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/keyten/diablo/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update info.json

* Update info.json

* Update keymap.c

* Update keymap.c

* Update keyboards/keyten/diablo/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/keyten/diablo/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

---------

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-17 11:50:44 -07:00
QMK Bot
cef1e2c5c6 Merge remote-tracking branch 'origin/develop' into xap 2023-12-17 11:28:24 +00:00
Nick Brassel
ae90b1d1e5
Merge remote-tracking branch 'upstream/master' into develop 2023-12-17 22:27:35 +11:00
Nick Brassel
7ea022ba88
[Keymap Removal] Planck and related keymaps. (#22683) 2023-12-17 21:54:01 +11:00
QMK Bot
1e0ce38faf Merge remote-tracking branch 'origin/develop' into xap 2023-12-17 08:40:35 +00:00
QMK Bot
02f6ab264d Merge remote-tracking branch 'origin/master' into develop 2023-12-17 08:40:06 +00:00
MakotoKurauchi
f0e4bc937a
Add keyboard Ergo68 (#22677)
* Ergo68の追加

* 写真の追加

* fix build error

* Update keyboards/yushakobo/ergo68/readme.md

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

* Update keyboards/yushakobo/ergo68/keymaps/via/keymap.c

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

* config.h migrated to info.json

* Update keyboards/yushakobo/ergo68/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/yushakobo/ergo68/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/yushakobo/ergo68/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/yushakobo/ergo68/keymaps/via/rules.mk

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/yushakobo/ergo68/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/yushakobo/ergo68/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/yushakobo/ergo68/info.json

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

* Update keyboards/yushakobo/ergo68/info.json

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

* Update keyboards/yushakobo/ergo68/info.json

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

---------

Co-authored-by: Salicylic-acid3 <46864619+Salicylic-acid3@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-12-17 01:39:35 -07:00
QMK Bot
acf92a7f17 Merge remote-tracking branch 'origin/develop' into xap 2023-12-17 05:01:58 +00:00
QMK Bot
94c64fef51 Merge remote-tracking branch 'origin/master' into develop 2023-12-17 05:01:26 +00:00
yuezp
849ddc27ee
[Keyboard] Add kafka60 (#22659)
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-16 22:00:58 -07:00
QMK Bot
4667e79967 Merge remote-tracking branch 'origin/develop' into xap 2023-12-17 02:19:17 +00:00
QMK Bot
9ec0f3cd59 Merge remote-tracking branch 'origin/master' into develop 2023-12-17 02:18:48 +00:00