summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29Mechlovin Hannah60RGB touch-up (#14646)James Young
* use XXX for KC_NO in rev1.h * add matrix diagram to rev1.h * remove reference to KBFirmware JSON Parser from rev1.h * use XXX for KC_NO in rev2.h * add matrix diagram to rev2.h * add LAYOUT_60_ansi and LAYOUT_60_iso * enable Community Layout support * update info.json metadata - specify keyboard revision in keyboard_name - use GitHub username in maintainer field * remove reference to KBFirmware JSON Parser from main rules.mk
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Core] Fix "6kro enable" and clarify naming (#14563)Drashna Jaelre
* Fix USB_6KRO_ENABLE compilation errors * Add info to docs * Rename define to be more accurate * Remove unused rule * Refixe docs
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keymap] Update to Drashna Code (#14644)Drashna Jaelre
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keyboard] add support for Quark_LP (#14552)npspears
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-29[Keyboard] Update Grandiceps to Rev2 (#14618)vattern
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Thys de Wet <thys@vectorphoto.co.uk>
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keymap] Jonavin murphpad keymap update (#14637)jonavin
Co-authored-by: Jonavin <=>
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keyboard] Updates for Tractyl Manuform config (#14641)Drashna Jaelre
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keyboard] Fix end of file issue for Owlab suit80 (#14640)Drashna Jaelre
2021-09-28[Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by ↵nachie
KapCave into their own directory (#14194) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nachiket Kulkarni <nachiket_kulkarni@apple.com>
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keymap] Keychron Q1 user keymap (#14636)Grayson Carr
2021-09-28Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639)James Young
* Fix for #14622 Fix for a bad merge conflict resolution.
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28convert checkerboards/quark_squared:via rules.mk to Unix line endings (#14638)James Young
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28Mechlovin Delphine: add LAYOUT_numpad_6x4 (#14635)James Young
* add LAYOUT_numpad_6x4 * tidy-up info.json data * use GitHub account name for maintainer field * remove meta key * add matrix diagram to delphine.h * update Community Layout support
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29Move "firmware size check skipped" note to message.mk (#14632)Ryan
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵jonavin
(#14278) Co-authored-by: Jonavin <=>
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keyboard] Yampad VIA support (#14397)Greg Knapp
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keyboard] Add OwLab Suit80 (#14362)owlab-git
* add suit80 files * first add suit80 files * modified suit80 files * layout change * modified again * changed png url
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ↵Alexander Kagno
(#14623) Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keyboard] Pteron36 (#13475)Harshit Goel
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Harshti Goel <harshitgoel@licious.com>
2021-09-28Merge remote-tracking branch 'upstream/master' into developJames Young
2021-09-28Mechlovin Adelais: add support for full-length Right Shift (#14622)James Young
* add layout variants with 2.75u Right Shift * move layout alias to info.json * match info.json labels to matrix positions Edits the label keys in info.json to match the matrix position identifiers in adelais.h. * info.json: add line breaks between keyboard rows * info.json: use GitHub username in maintainer field
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-27[Keyboard] Add dz60rgb_ansi v2_1 (#14614)Dasky
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-27[Keyboard] z12 micropad by zigotica (#14583)Sergi Meseguer
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-27[Keyboard] Add BM80 Keyboard (#12948)peepeetee
* Initial compatibility with bm80 * move files to kprepublic directory, see #12159 * fix pin assignment * Revert "fix pin assignment" This reverts commit 5a53a74953a23bb5064c11d5d9e6daf007a54872. * add testing setup (peepeetee keymap, will use for personal purposes later), fix LED assignment, add indicator LED, LED location, count, and flags are broken * fixed flags( not sure, please check) * fixed number of LEDs * add comment about f11 * remove comment about f11, change capslock flag to be 1 rather than 1+8 as there is a standalone indicator LED * readme.md * add via keymap * add info.json with help from noroadsleft's converter * add suspended state implementation, I don't think it's working * update to my testing setup * restore erroneously included bm68rgb config * Update keyboards/kprepublic/bm80/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * add reset instructions * change reset instruction grammar * remove not working sleep function, add comment for RGB flags * add LED mapping comments * change readme grammar * replace rgb light paremeters with rgb matrix paremeters, enable framebuffer effects * re-enable peepeetee/config.h, updating my disabled effect list * updating my disabled effect list * update LED struct documentation * update readme with RGB matrix effect information * Update keyboards/kprepublic/bm80/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * move files back to keyboard from keyboard/kprepublic, see 85b33d6 and qmk#12159 * Apply suggestions from code review Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * cleanup peepeetee keymap * update peepeetee keymap; rebase on current master * moved to /kprepublic, see #12159 * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review 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-09-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28Zinc: Clean up LTO rules (#14597)Ryan
2021-09-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28SquishyTKL: Layouts cleanup (#14594)Ryan
2021-09-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-27Cleanup issues identified by lgtm (#14459)Zach White
* cleanup issues identified by lgtm * fix the git_status check
2021-09-27Merge remote-tracking branch 'origin/master' into developQMK Bot