summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-09CLI: Use BASH if SHELL variable is not set (Windows) (#12847)Erovia
2021-05-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-10[CI] Format code according to conventions (#12838)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-05-10Remove pointless SERIAL_LINK_ENABLE rules (#12846)Ryan
2021-05-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-09Add script to perform parallel builds. (#12497)Nick Brassel
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-05-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-09Align qmk info ascii logic with milc logging (#11627)Joel Challis
2021-05-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-09Allow MAKE environment override for 'qmk clean' (#12473)Joel Challis
2021-05-08New command: qmk console (#12828)Zach White
* stash poc * stash * tidy up implementation * Tidy up slightly for review * Tidy up slightly for review * Bodge environment to make tests pass * Refactor away from asyncio due to windows issues * Filter devices * align vid/pid printing * Add hidapi to the installers * start preparing for multiple hid_listeners * udev rules for hid_listen * refactor to move closer to end state * very basic implementation of the threaded model * refactor how vid/pid/index are supplied and parsed * windows improvements * read the report directly when usage page isn't available * add per-device colors, the choice to show names or numbers, and refactor * add timestamps * Add support for showing bootloaders * tweak the color for bootloaders * Align bootloader disconnect with connect color * add support for showing all bootloaders * fix the pyusb check * tweaks * fix exception * hide a stack trace behind -v * add --no-bootloaders option * add documentation for qmk console * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * pyformat * clean up and flesh out KNOWN_BOOTLOADERS Co-authored-by: zvecr <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-08haptic: correct size of reserved field in the haptic structure. This saves 1 ↵Purdea Andrei
byte of wasted SRAM. (#12483) Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-08add ttys0's planck and preonic keymaps (#10560)Sean Johnson
* resynced with upstream, and adjusted keymap layout for planck * updated keyboard layout Signed-off-by: Sean Johnson <sean@ttys0.net> * swapped out bspc for del on symb layer Signed-off-by: Sean Johnson <sean@ttys0.net> * fixed typo with brightness media keys * turns out my brightness config was correct, it was macOS that had gone sideways * updated to bring in line with requirements for merging into upstream * removed redundant config from rules.mk moved media controls to FUNC layer for Planck layout * added GPL2+ compatible license header Signed-off-by: Sean Johnson <sean@skj.dev> * removed unused MIDI comment Signed-off-by: Sean Johnson <sean@skj.dev> * removed extraneous MIDI comments * removed extraneous comments
2021-05-08Resolve a number of warnings in `qmk generate-api` (#12833)Zach White
2021-05-08fix some references to bin/qmk that slipped in (#12832)Zach White
2021-05-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-08Update sethBarberee Userspace (#12620)Seth Barberee
* update for LTO and guard RGBLED_SPLIT * Revert "update for LTO and guard RGBLED_SPLIT" This reverts commit ce81177cbe330ae3e1e14c264dc0cb0946f08d70. * Revert "Revert "update for LTO and guard RGBLED_SPLIT"" This reverts commit 67da0ce9f38777064ad094c1ecba7ce17a40994f. * update iris keymap for keymap_kc removal and overhaul userspace * add licenses * fix tap_dance error when rgblight is disabled and update/clean iris/sinc maps
2021-05-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-08Hbbisenieks keymap update to remove kc_ keymaps (#12391)Hilary B. Brenum
* hbbisenieks keymap * change from kc_ keymap * Apply suggestions from code review Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Hilary Brenum <hilary.brenum@tanium.com> Co-authored-by: Zach White <skullydazed@drpepper.org> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
2021-05-08Added OLED fade out support (#12086)Barabas
2021-05-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-07Update FreeBSD install method (#12815)Mateusz Piotrowski
The easiest way to install QMK CLI and all the necessary dependencies on FreeBSD is to use the packages from the official FreeBSD Ports Collection. This is possible since QMK CLI has been added to the Ports Collection: https://www.freshports.org/sysutils/py-qmk/
2021-05-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-07[Keymap] My Arisu layout setup (#12647)stanrc85
2021-05-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-06Fix DZ60 64 key layout (#12551)kb-elmo
* add gk64 layout * Apply suggestions from code review * fix dz60 gk64 layout
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