1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

18923 commits

Author SHA1 Message Date
Ryan 3c0eeec755
Try to clarify "number of elements in info.json does not match" error (#14844) 2021-10-16 17:44:56 +01:00
QMK Bot 776e6b8d37 Merge remote-tracking branch 'origin/master' into develop 2021-10-16 16:03:50 +00:00
tangowithfoxtrot 9200baf593
[Keyboard] Fix minor typo in Ploopy Trackball Nano Docs (#14717) 2021-10-16 09:03:12 -07:00
QMK Bot 82bff2d80c Merge remote-tracking branch 'origin/master' into develop 2021-10-16 08:31:35 +00:00
Takeshi ISHII eddb206369
add docs/ja/ja_doc_status.sh (#14402) 2021-10-16 17:31:09 +09:00
QMK Bot fbdaf8ed32 Merge remote-tracking branch 'origin/master' into develop 2021-10-16 06:09:14 +00:00
AKiwi92 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
QMK Bot 9c15fbf9b3 Merge remote-tracking branch 'origin/master' into develop 2021-10-16 06:07:12 +00:00
hadi 79a34d8ec3
[Keyboard] Adding CK60 and CK65 (#14737)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15 23:06:43 -07:00
QMK Bot ede6122ac6 Merge remote-tracking branch 'origin/master' into develop 2021-10-16 05:34:23 +00:00
Manna Harbour 6b299fab6e
[Keymap] Update Miryoku (#14827) 2021-10-15 22:33:45 -07:00
Drashna Jael're e5662aa53d
Merge remote-tracking branch 'origin/master' into develop 2021-10-15 22:32:41 -07:00
Drashna Jaelre 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
QMK Bot a27c949a32 Merge remote-tracking branch 'origin/master' into develop 2021-10-16 05:10:08 +00:00
Drashna Jaelre a8422cca03
[Keyboard] Tractyl Manuform Updates (#14841) 2021-10-15 22:09:40 -07:00
Drashna Jael're b36f2609fe
Merge remote-tracking branch 'origin/master' into develop 2021-10-15 19:08:00 -07:00
BenSchaeff 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
QMK Bot a119149513 Merge remote-tracking branch 'origin/master' into develop 2021-10-16 02:02:07 +00:00
Sergi Meseguer 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
floookay 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
QMK Bot 36fc46ead7 Merge remote-tracking branch 'origin/master' into develop 2021-10-16 02:00:50 +00:00
stanrc85 8bb1fd04d4
[Keymap] Userspace updates (#14832) 2021-10-15 19:00:19 -07:00
Joel Challis 83e978da1f
Further tidy up of STM32 eeprom emulation (#14591) 2021-10-16 02:58:48 +01:00
QMK Bot 5c6a8f599f Merge remote-tracking branch 'origin/master' into develop 2021-10-16 00:43:42 +00:00
Aaron Paterson 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
Joel Challis 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
Drashna Jael're d7f69dc620
Merge remote-tracking branch 'origin/master' into develop 2021-10-14 21:26:49 -07:00
Felix Jen 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
Ryan b7a346600c
[Docs] Clean up reference_info_json.md (#14806) 2021-10-15 12:45:33 +11:00
Tom dd42387d9f
[Keymap] Add keebio iris layout beakl 15 (#14762) 2021-10-14 18:11:01 -07:00
Alex Meyer 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
James Young 44bfe04f53
[Keyboard] PLX Refactor (#14809) 2021-10-14 17:00:08 -07:00
QMK Bot 63d27b7c9d Merge remote-tracking branch 'origin/master' into develop 2021-10-14 23:56:29 +00:00
rhmokey 943ca36acc
[Keyboard] Add ginkgo65 (#14802)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 16:55:51 -07:00
QMK Bot 92984957f8 Merge remote-tracking branch 'origin/master' into develop 2021-10-14 23:04:30 +00:00
MechMerlin a827adeaae
Documentation: Updated KBDFans readmes (#14725)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 16:03:53 -07:00
QMK Bot 55695ff929 Merge remote-tracking branch 'origin/master' into develop 2021-10-14 17:29:17 +00:00
Reibl János Dániel e8dadf51ad
[Keymap] Display default layer name (#14819) 2021-10-14 10:28:06 -07:00
QMK Bot 578cbdc495 Merge remote-tracking branch 'origin/master' into develop 2021-10-14 13:48:05 +00:00
Steven Karrmann 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
QMK Bot 793f4499bf Merge remote-tracking branch 'origin/master' into develop 2021-10-14 13:42:04 +00:00
Sergey Vlasov 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
QMK Bot 49e0d2ea03 Merge remote-tracking branch 'origin/master' into develop 2021-10-13 08:57:24 +00:00
James Young 04cf161aa0
maxr1998/pulse4k: use layout macros in keymaps (#14808) 2021-10-13 19:56:48 +11:00
QMK Bot 0b2c506f66 Merge remote-tracking branch 'origin/master' into develop 2021-10-13 06:50:42 +00:00
James Young 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
QMK Bot 918e4fb02c Merge remote-tracking branch 'origin/master' into develop 2021-10-13 05:48:31 +00:00
James Young 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
QMK Bot 602d7a1867 Merge remote-tracking branch 'origin/master' into develop 2021-10-13 05:41:28 +00:00
James Young 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