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
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
dd42387d9f
[Keymap] Add keebio iris layout beakl 15 ( #14762 )
2021-10-14 18:11:01 -07: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
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
ec32365944
Kopibeng MNK88 Patch ( #14807 )
...
* refactor default keymap
- correct keycode sequence (`KC_RGHT` was in the wrong place)
- change tabs to spaces (four-space indent)
- update grid alignment
* refactor via keymap
- change tabs to spaces (four-space indent)
- update grid alignment
2021-10-12 23:50:04 -07:00
918e4fb02c
Merge remote-tracking branch 'origin/master' into develop
2021-10-13 05:48:31 +00:00
bc51e330c0
Lucid Alexa layout macro rework ( #14799 )
...
* refactor keymaps for readability
- use QMK-native keycode aliases
- physically align keycodes
* rework layout macro
A discrepancy between the default and via keymaps prompted a deep dive into the keyboard's switch matrix, which led to the discovery that (1) the layout macro's arguments were not arranged physically, and (2) the keymaps didn't assign the keycodes to the same switches (the default keymap's keycodes were in the wrong sequence).
Additionally, the layout macro was built to support a split Backspace, but named as if it were for a 2u Backspace, which broke the enabled support for Community Layout keymaps.
This commit:
- arranges the layout macro arguments according to physical order
- corrects the keymaps
- renames the layout macro to specify the split Backspace
- disables Community Layout support
- updates the `info.json` data
* add LAYOUT_65_ansi_blocker
* enable Community Layout support
* update `info.json` metadata
- use full product listing URL
- use GitHub username for maintainer field
* update readme
- fix vendor link in lead paragraph
- update metadata list
- use GitHub username of keyboard maintainer
- correct Supported Hardware
- add Hardware Availability link
- add flashing and bootloader instructions
2021-10-12 22:47:54 -07:00
602d7a1867
Merge remote-tracking branch 'origin/master' into develop
2021-10-13 05:41:28 +00:00
c63c78f080
Kopibeng MNK88 Layout Extension ( #14796 )
...
* friendly-format info.json
* mnk88.h: use QMK 3-character notation
* mnk88.h: add matrix diagram
* add LAYOUT_tkl_ansi_f13
* add LAYOUT_tkl_ansi_tsangan_f13
* add LAYOUT_tkl_iso_f13
* add LAYOUT_tkl_iso_tsangan_f13
2021-10-12 22:40:48 -07:00
1e47c933cd
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 02:42:19 +00:00
a0b7c1618a
[Keyboard] Add MachKeyboards Mach3 ( #14791 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-11 19:42:14 -07:00
2d8dcf08e8
[Keyboard] Add "Center x Enter" ( #14790 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-11 19:41:50 -07:00
3ed44b9c9a
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 02:41:00 +00:00
78509658e6
KabeDon98E Refactor ( #14778 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2021-10-11 19:40:29 -07:00
4e21efd48a
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 02:26:00 +00:00
25eac95348
[Keyboard] Add ISOlation and some kb-elmo keyboard updates ( #14656 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-11 19:25:28 -07:00
a3244a010d
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:45:23 +00:00
bedecd3cbc
Nordic60 layout rework/extension ( #14794 )
2021-10-11 18:44:47 -07:00
5c8953387e
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:09:53 +00:00
8385ab32d0
[Keyboard] Add Split65 to keyboards/handwired ( #13264 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joris Wachsmuth <jwachsmuth@techfak.uni-bielefeld.de>
2021-10-11 18:09:25 -07:00
c49fd91e7a
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:07:15 +00:00
e33ccc556f
[Keymap] Added Gherkin VIA keymap ( #14779 )
2021-10-11 18:06:48 -07:00
38228e40d1
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:05:00 +00:00
598f3fa7a7
[Keyboard] z34 split keyboard by zigotica ( #14582 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-11 18:04:47 -07:00
QMK Bot
AKiwi92
hadi
Manna Harbour
Drashna Jael're
BenSchaeff
Sergi Meseguer
floookay
Felix Jen
Tom
James Young
rhmokey
MechMerlin
Steven Karrmann
Sergey Vlasov
etiennelepagel
takashicompany
kb-elmo
Joris Wachsmuth
thompson-ele