summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-15Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-10-15[Keymap] Added GMMK Pro keymap with RGB (#14648)BenSchaeff
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-15[Keymap] zigotica userspace (#14670)Sergi Meseguer
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15[Keyboard] add Pluckey (#14672)floookay
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-15[Keymap] Userspace updates (#14832)stanrc85
2021-10-16Further tidy up of STM32 eeprom emulation (#14591)Joel Challis
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-16Update documentation because GPIO functions are no longer in quantum.h (#14826)Aaron Paterson
* 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-15Enable CLI flashing via mdloader (#14729)Joel Challis
* Enable CLI flashing via mdloader * remove flag * Update qmk flash help
2021-10-14Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-10-14[Keyboard] Add MK61-RGB-ANSI keyboard (#14795)Felix Jen
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15[Docs] Clean up reference_info_json.md (#14806)Ryan
2021-10-14[Keymap] Add keebio iris layout beakl 15 (#14762)Tom
2021-10-15remove Bracket Pair Colorizer recommendation (#14816)Alex Meyer
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-14[Keyboard] PLX Refactor (#14809)James Young
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14[Keyboard] Add ginkgo65 (#14802)rhmokey
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14Documentation: Updated KBDFans readmes (#14725)MechMerlin
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14[Keymap] Display default layer name (#14819)Reibl János Dániel
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14Add KC_BSLS key to Horizon keyboard default layout (#14815)Steven Karrmann
* 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-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14contra, fractal: Remove wrongly copypasted pin E6 manipulation code (#14818)Sergey Vlasov
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-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-13maxr1998/pulse4k: use layout macros in keymaps (#14808)James Young
2021-10-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-12Kopibeng MNK88 Patch (#14807)James Young
* 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-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-12Lucid Alexa layout macro rework (#14799)James Young
* 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-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-12Kopibeng MNK88 Layout Extension (#14796)James Young
* 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-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11[Keyboard] Add MachKeyboards Mach3 (#14791)etiennelepagel
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-11[Keyboard] Add "Center x Enter" (#14790)takashicompany
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11KabeDon98E Refactor (#14778)James Young
Co-authored-by: Joel Challis <git@zvecr.com>
2021-10-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11[Keymap] Add workman layout (#14792)Reibl János Dániel
2021-10-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11[Keyboard] Add ISOlation and some kb-elmo keyboard updates (#14656)kb-elmo
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11Nordic60 layout rework/extension (#14794)James Young
2021-10-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11[Keyboard] Add Split65 to keyboards/handwired (#13264)Joris Wachsmuth
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-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11[Keymap] Added Gherkin VIA keymap (#14779)thompson-ele