Commit Graph

15184 Commits

Author SHA1 Message Date
01c5ee6f7d Merge remote-tracking branch 'origin/master' into develop 2021-03-04 18:16:03 +00:00
4d41645598 Dubba175 (#12077)
* dubba175 initial

* Following checklist

* Update readme.md

* Update keyboards/dubba175/keymaps/default/keymap.c

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

* Update keyboards/dubba175/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/dubba175/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/dubba175/rules.mk

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update config.h

* Update keyboards/dubba175/readme.md

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

* Update keyboards/dubba175/rules.mk

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

* Update keyboards/dubba175/rules.mk

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-04 13:15:16 -05:00
8f54152fab Merge remote-tracking branch 'origin/master' into develop 2021-03-04 15:20:45 +00:00
b1a8fafa62 [Docs] Japanese translation of docs/keycodes.md (#10192)
* copy 'keycodes.md'.

* Translated 'keycodes.md'.

* Fixed typo.

* Fixed typo.

* Apply suggestions from code review

Co-authored-by: shela <shelaf@users.noreply.github.com>
Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

* update based on comment.

* update based on comment.

* Update docs/ja/keycodes.md

* update based on comment.

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

* update based on comment.

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

* update based on comment.

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

* Update docs/ja/keycodes.md

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

* update based on comment.

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

Co-authored-by: shela <shelaf@users.noreply.github.com>
Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
2021-03-05 00:20:01 +09:00
54f6ff3bd5 Merge remote-tracking branch 'origin/master' into develop 2021-03-04 04:10:10 +00:00
6461087c86 qmk generate-rules-mk: add --escape switch for makefile logic (#12101) 2021-03-04 15:09:22 +11:00
d3092ced99 Merge remote-tracking branch 'origin/master' into develop 2021-03-04 01:02:37 +00:00
7aa74c227b [Keyboard] Add Studio Kestra Nue PCB (#12094) 2021-03-03 17:02:27 -08:00
0fd95e5db5 Remove ifdefs for Swap Hands keycodes (#12095) 2021-03-03 17:02:00 -08:00
6c3af2670e Fixup line endings. 2021-03-04 10:35:02 +11:00
8f30f4170c cannonkeys/atlas_alps: rename via keymaps rules.mk.txt to rules.mk (#12103)
File doesn't work without the correct filename.
2021-03-03 22:33:14 +00:00
ad4cfffe3d Format code according to conventions (#12102)
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-03 13:44:55 -08:00
6a4960889e Merge remote-tracking branch 'origin/master' into develop 2021-03-03 21:33:06 +00:00
2dcd67ce1a [Keymap] sigma-squared (#11694) 2021-03-03 13:32:22 -08:00
064265166c Merge remote-tracking branch 'origin/master' into develop 2021-03-03 21:32:18 +00:00
4c3090ace9 Documentation changes SPLIT_USB_DETECT and hid_listen udev rules (#11665)
Co-authored-by: David Grundberg <david@quartz>
2021-03-03 13:31:41 -08:00
9f6ce448bd Merge remote-tracking branch 'origin/master' into develop 2021-03-03 21:15:31 +00:00
fb3777f085 [Keyboard] Add Conone 65 (#11827)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-03 13:14:55 -08:00
c26344fc93 Merge remote-tracking branch 'origin/master' into develop 2021-03-03 20:38:58 +00:00
018b8e1d62 [Keyboard] Add Keyboard Rartlite (#11866) 2021-03-03 12:38:16 -08:00
4235160dcf Merge remote-tracking branch 'origin/master' into develop 2021-03-03 20:37:52 +00:00
ba3c346195 Update dichotomy/alairock layout (#12013) 2021-03-03 12:37:06 -08:00
73120947cf Merge remote-tracking branch 'origin/master' into develop 2021-03-03 20:28:54 +00:00
e420b3981c [Keyboard] Added VIA folder under the keymaps folder (#12021)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-03 12:28:10 -08:00
5762bc4a5f Merge remote-tracking branch 'origin/master' into develop 2021-03-03 18:52:36 +00:00
76cd6b662b [Keymap] Add grant24 Planck Rev 6 keymap (#12070)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-03 10:51:39 -08:00
41933efbf0 [Keyboard] Enable RGB Matrix for Corne (#12091) 2021-03-03 10:38:21 -08:00
18a333ec6b Add support for complementary outputs to the WS2812 PWM driver (#11988) 2021-03-02 20:26:06 -08:00
8f5d2e546e Merge remote-tracking branch 'origin/master' into develop 2021-03-03 04:07:13 +00:00
0b6ff59448 [Keymap] Add ddone's iris keymap (#12055) 2021-03-02 20:06:40 -08:00
4132dd87a4 Merge remote-tracking branch 'origin/master' into develop 2021-03-03 02:59:37 +00:00
0752b6b23c [Docs] Small spelling mistake fix in leader keys (#12087) 2021-03-02 18:59:03 -08:00
d950b97115 Format code according to conventions (#12088)
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-03 07:54:11 +11:00
cde2859a65 Split RGB Matrix (#11055)
* Split RGB Matrix

* Suspend State sync for rgb matrix
2021-03-03 07:32:15 +11:00
967d7c47dc Merge remote-tracking branch 'origin/master' into develop 2021-03-02 14:33:32 +00:00
c5b0b6ff32 Remove more cruft from Lily58 default keymap (#12078)
* Remove more cruft from lily58 default keymap

* Update keyboards/lily58/keymaps/default/config.h

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

* Update config.h

Remove extra newline

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-02 14:32:44 +00:00
4c04c848b5 Merge remote-tracking branch 'origin/master' into develop 2021-03-02 14:32:29 +00:00
ab3986a684 Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled (#12081) 2021-03-02 14:31:23 +00:00
27d2fb88ca Merge remote-tracking branch 'origin/master' into develop 2021-03-02 05:29:53 +00:00
d0108869ee [Docs] MATRIX_MASKED docs for SPLIT_HAND_MATRIX_GRID (#11974) 2021-03-01 21:29:11 -08:00
de585e3109 Merge remote-tracking branch 'origin/master' into develop 2021-03-02 04:34:43 +00:00
58d043b0d0 [Keyboard] Update eggman info.json (#12074)
attempting to fix qmk configurator issues
2021-03-01 20:34:13 -08:00
e662de94f6 Merge remote-tracking branch 'origin/master' into develop 2021-03-02 03:10:19 +00:00
d918d571cc Fix the typo in ergodone 80 layout (#12075) 2021-03-02 14:09:35 +11:00
4fedf6efbd Merge remote-tracking branch 'origin/master' into develop 2021-03-02 01:18:42 +00:00
75ab48958c Revert "Fixing K-type RGB lighting (#11551)" (#12065)
This reverts commit e6f7da4036.
2021-03-02 12:18:07 +11:00
1beb6b686a Merge remote-tracking branch 'origin/master' into develop 2021-03-01 19:57:19 +00:00
3200007a69 Fixing adjust layer issue with the lily58 default keymap (#12052)
* Fix triggering of adjust layer in default lily58 keymap

* Remove unused extern

* Swap raise/lower in update_tri_layer_state call to match recommendation in PR checklist
2021-03-01 19:56:42 +00:00
50290c78b6 Format code according to conventions (#12076)
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-01 18:08:18 +00:00
0e984b6e7e Add ability to toggle One Shot functionality (#4198)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-01 08:57:02 -08:00