9a1cc8b70c
Merge remote-tracking branch 'origin/master' into develop
2021-10-17 02:51:32 +00:00
b8ca0af06a
[Keyboard] Add SpiderIsland 25 key keyboard ( #14793 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-16 19:51:02 -07:00
3f582486ad
Merge remote-tracking branch 'origin/master' into develop
2021-10-17 02:23:08 +00:00
772f67484f
[Keyboard] Update Support for The Uni ( #14569 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
2021-10-16 19:22:35 -07:00
b0c2dd8d50
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 16:45:28 +00:00
3c0eeec755
Try to clarify "number of elements in info.json does not match" error ( #14844 )
2021-10-16 17:44:56 +01:00
776e6b8d37
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 16:03:50 +00:00
9200baf593
[Keyboard] Fix minor typo in Ploopy Trackball Nano Docs ( #14717 )
2021-10-16 09:03:12 -07:00
82bff2d80c
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 08:31:35 +00:00
eddb206369
add docs/ja/ja_doc_status.sh ( #14402 )
2021-10-16 17:31:09 +09:00
fbdaf8ed32
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 06:09:14 +00:00
9e2e773782
[Keyboard] Amended Some Pins - KiwiKeebs Macro V2 ( #14824 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ash <ash@splitpixel.co.uk>
2021-10-15 23:08:41 -07:00
9c15fbf9b3
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 06:07:12 +00:00
79a34d8ec3
[Keyboard] Adding CK60 and CK65 ( #14737 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15 23:06:43 -07:00
ede6122ac6
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 05:34:23 +00:00
6b299fab6e
[Keymap] Update Miryoku ( #14827 )
2021-10-15 22:33:45 -07:00
e5662aa53d
Merge remote-tracking branch 'origin/master' into develop
2021-10-15 22:32:41 -07:00
9a0addc77e
[Keymap] Drashna Keymap Updates ( #14842 )
...
* Fix issues with user split transport code
* Improve OLED (More font stuff, improved keylogger, etc)
* Add `KEYLOCK` macro to disable USB, borrowed from command feature.
* Convert Kyria fully to proton C (no more AVR kyria)
* Add Work Louder Work Board keymap
2021-10-15 22:30:23 -07:00
a27c949a32
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 05:10:08 +00:00
a8422cca03
[Keyboard] Tractyl Manuform Updates ( #14841 )
2021-10-15 22:09:40 -07:00
b36f2609fe
Merge remote-tracking branch 'origin/master' into develop
2021-10-15 19:08:00 -07:00
4db5d85273
[Keymap] Added GMMK Pro keymap with RGB ( #14648 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15 19:02:19 -07:00
a119149513
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 02:02:07 +00:00
40badc4413
[Keymap] zigotica userspace ( #14670 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15 19:02:04 -07:00
b0d293a841
[Keyboard] add Pluckey ( #14672 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15 19:01:35 -07:00
36fc46ead7
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 02:00:50 +00:00
8bb1fd04d4
[Keymap] Userspace updates ( #14832 )
2021-10-15 19:00:19 -07:00
83e978da1f
Further tidy up of STM32 eeprom emulation ( #14591 )
2021-10-16 02:58:48 +01:00
5c6a8f599f
Merge remote-tracking branch 'origin/master' into develop
2021-10-16 00:43:42 +00:00
c8b00b2e91
Update documentation because GPIO functions are no longer in quantum.h ( #14826 )
...
* GPIO functions are no longer in quantum.h
* Update docs/internals_gpio_control.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-16 01:43:03 +01:00
40bc5a8192
Enable CLI flashing via mdloader ( #14729 )
...
* Enable CLI flashing via mdloader
* remove flag
* Update qmk flash help
2021-10-15 22:07:33 +01:00
d7f69dc620
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 21:26:49 -07:00
235323269c
[Keyboard] Add MK61-RGB-ANSI keyboard ( #14795 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 21:22:55 -07:00
b7a346600c
[Docs] Clean up reference_info_json.md ( #14806 )
2021-10-15 12:45:33 +11:00
dd42387d9f
[Keymap] Add keebio iris layout beakl 15 ( #14762 )
2021-10-14 18:11:01 -07:00
c2d72a60f0
remove Bracket Pair Colorizer recommendation ( #14816 )
...
As of v1.60, vscode has a much faster built-in method of colorizing bracket pairs, making the extension unnecessary.
https://code.visualstudio.com/blogs/2021/09/29/bracket-pair-colorization
2021-10-15 11:54:19 +11:00
44bfe04f53
[Keyboard] PLX Refactor ( #14809 )
2021-10-14 17:00:08 -07:00
63d27b7c9d
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 23:56:29 +00:00
943ca36acc
[Keyboard] Add ginkgo65 ( #14802 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 16:55:51 -07:00
92984957f8
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 23:04:30 +00:00
a827adeaae
Documentation: Updated KBDFans readmes ( #14725 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 16:03:53 -07:00
55695ff929
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 17:29:17 +00:00
e8dadf51ad
[Keymap] Display default layer name ( #14819 )
2021-10-14 10:28:06 -07:00
578cbdc495
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 13:48:05 +00:00
b8de20f1e2
Add KC_BSLS key to Horizon keyboard default layout ( #14815 )
...
* Define Horizon keyboard
* Set indentation according to QMK coding convention
* Update horizon keyboard readme to satisfy current QMK template
* Use row-column order in horizon readme
* Update keyboards/horizon/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/horizon/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/horizon/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add KC_BSLS to Horizon default keymap
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 14:47:29 +01:00
793f4499bf
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 13:42:04 +00:00
f9f3a11c20
contra, fractal: Remove wrongly copypasted pin E6 manipulation code ( #14818 )
...
Apparently the default keymaps for `contra` and `fractal` were derived
from some `planck` keymap which contained code to control the status LED
in the implementation of the `BACKLIT` custom keycode. Unfortunately,
the code to control the LED manipulated the `E6` pin directly, and it
was copied without changes, but the `contra` and `fractal` boards use
the `E6` pin in the matrix, therefore pressing the key mapped to
`BACKLIT` resulted in phantom keypresses for all keys in the
corresponding column.
2021-10-14 14:41:30 +01:00
49e0d2ea03
Merge remote-tracking branch 'origin/master' into develop
2021-10-13 08:57:24 +00:00
04cf161aa0
maxr1998/pulse4k: use layout macros in keymaps ( #14808 )
2021-10-13 19:56:48 +11:00
0b2c506f66
Merge remote-tracking branch 'origin/master' into develop
2021-10-13 06:50:42 +00:00
QMK Bot
Andrzej Ressel
Peter Park
Ryan
tangowithfoxtrot
Takeshi ISHII
AKiwi92
hadi
Manna Harbour
Drashna Jael're
BenSchaeff
Sergi Meseguer
floookay
stanrc85
Joel Challis
Aaron Paterson
Felix Jen
Tom
Alex Meyer
James Young
rhmokey
MechMerlin
Reibl János Dániel
Steven Karrmann
Sergey Vlasov