summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-06Add docs on multiple encoders sharing pins (#11678)timothynsheehan
Added explanation of how multiple encoders can share pins and the limitations of this configuration
2021-05-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-06Add a handful of consumer/gendesk page usages (#12811)Ryan
2021-05-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-06Fix qmk flash on FreeBSD (#12085)Mateusz Piotrowski
When the USB device is connected, FreeBSD creates not one, but three device nodes in /dev, e.g.: /dev/ttyU0, /dev/ttyU0.init, and /dev/ttyU0.lock. As a result, this leads to the USB variable containing 3 paths (and therefore, whitespace) and messages like this one: Device /dev/ttyU0 /dev/ttyU0.init /dev/ttyU0.lock has appeared; assuming it is the controller. This changes fixes the use of the -z flag of "[" (see test(1)). Also, it removes undesired paths from the USB variable, leaving only one path there (i.e., "/dev/ttyU0").
2021-05-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-04[Keyboard] ai03 Andromeda (#12676)Andrew Kannan
* Add andromeda to qmk * Fix * Another fix * Fix via map * Update andromeda * Update confs for new qmk master * Apply suggestions from code review * Remove the ch hal and mcu conf as the andromeda does not need extra peripherals * Update keyboards/ai03/andromeda/rules.mk * Apply suggestions from code review * Add bootloader note to readme
2021-05-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-04[Keyboard] added Time 80 Reforged by Fox Lab (#11996)Matrix Zou
* [Keyboard] added Time 80 Reforged by Fox Lab * added Time 80 Reforged by Fox Lab * split to two sub directories for universal and hotswap pcb * Apply suggestions from code review * Modified codes as suggested * update code as suggested * rgb log light keymaps added * update code as suggested * enable rgblight right to TIME logo, and add keymaps for it's control * Apply suggestions from code review * enable built-in switch LED support * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review
2021-05-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-03Update noroadsleft userspace and keymaps (2021-05-03) (#12796)James Young
* Set Dvorak as the standard base layer * Remove unneeded includes * Remove custom handling for Quake 2 Have now rewritten my in-game configuration to use Dvorak mapping instead of QWERTY, which means I don't need any of this stuff. * Clean up comments in KC60 keymap
2021-05-03Fix comment parsing (#12750)Zach White
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-05-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-02Shim cli to new keyboard script (#12780)Joel Challis
* Shim cli to new keyboard script * Shim cli to new keyboard script * Add docs
2021-05-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-02Fix unused import in recent generation code (#12781)Joel Challis
2021-05-02[CI] Format code according to conventions (#12772)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-05-01Fixing transport's led/rgb matrix suspend state logic (#12770)XScorpion2
2021-05-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-01Allow <keyboard>.h to be optional when going data driven (#12706)Joel Challis
* Allow <keyboard>.h to be optional when going data driven * Remove stub files as no longer required * Rename function * Remove include of layouts.h for now * Take advantage of type=keyboard_folder * Take advantage of type=keyboard_folder - kb should still be mandatory
2021-04-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-01[Keyboard] Fix bootloader rule for meishi2 keyboard (#12740)k.bigwheel
2021-04-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-30Add breeze variants (#12596)David Fryer
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Adrian <42110361+xSteins@users.noreply.github.com>
2021-04-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-29DracuLad: add Configurator data and rework layout macro (#12727)James Young
* add info.json file * refactor keymaps for readability * rework layout macro Arranges the layout macro and keycodes to resemble the physical layout. * readme touch-up Corrections to capitalization and spelling, and removal of extra white space.
2021-04-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-29Add firmware for CozyKeys Bloomer keyboard (#12639)Paul Ewing
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-30Align drivers.txt with toolbox (#12741)Joel Challis
2021-04-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-29Fix F13 LED issue for WT75-B, WT75-C (#12729)Wilba
2021-04-29[CI] Format code according to conventions (#12731)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-29Change RGB/LED Matrix to use a simple define for USB suspend (#12697)Drashna Jaelre
2021-04-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-28Fix up bad keycode in #12405. (#12722)Nick Brassel
2021-04-28Fix bad PR merge for #6580. (#12721)Nick Brassel
2021-04-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-28add default folder to standard (#12712)Xelus22
2021-04-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-27YMDK Wings: Update config.h (#12718)alittlepeace
Adds Caps Lock LED indicator configuration.
2021-04-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-27Add flashing instructions to GMMK Pro readme (#12719)James Young
2021-04-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-27GMMK Pro: Fixed Bootmagic Lite support; personal keymap; VIA support (#12554)W. Ducky
* Added WholesomeDucky keymap for GMMK Pro * Finalized keymap & added 1000hz polling for GMMK Pro * Corrected for RAlt and Fn being swapped * Fixed RAlt and Fn being swapped in the layout definition. Updated personal keymap to reflect fixed layout. * Removed an old comment from personal keymap for GMMK Pro * added VIA support * Defined bootmagic row and column for GMMK Pro Esc key * Update keyboards/gmmk/pro/config.h * Update keyboards/gmmk/pro/keymaps/via/keymap.c * Update keyboards/gmmk/pro/keymaps/via/keymap.c
2021-04-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-27Add Draculad keyboard (#12604)Mango The Fourth
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: mangoiv <mangoiv@outlook.com>
2021-04-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-27GMMK Pro: add RESET binding, fix layout macro bug (#12684)Ryan Mitchell
* add RESET binding, fix layout mod key bug (fixes #12683) * remove underscore #define and use core's instead