summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-0/+13
|\|
| * Catch 'LAYOUTS = all' in lint (#12848)Joel Challis2021-05-091-0/+13
| | | | | | Co-authored-by: Zach White <skullydazed@drpepper.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-097-117/+188
|\|
| * KBDMini refactor (#12850)Ryan2021-05-107-117/+188
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-3/+3
|\|
| * fix the makefile snippet so flake8 and yapf don't fight (#12849)Zach White2021-05-091-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-1/+1
|\|
| * CLI: Use BASH if SHELL variable is not set (Windows) (#12847)Erovia2021-05-091-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-092-8/+11
|\|
| * [CI] Format code according to conventions (#12838)github-actions[bot]2021-05-102-8/+11
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Remove pointless SERIAL_LINK_ENABLE rules (#12846)Ryan2021-05-1016-16/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-093-1/+89
|\|
| * Add script to perform parallel builds. (#12497)Nick Brassel2021-05-093-1/+89
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-3/+3
|\|
| * Align qmk info ascii logic with milc logging (#11627)Joel Challis2021-05-091-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-092-12/+30
|\|
| * Allow MAKE environment override for 'qmk clean' (#12473)Joel Challis2021-05-092-12/+30
| |
* | New command: qmk console (#12828)Zach White2021-05-0812-22/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-1/+1
|\|
| * haptic: correct size of reserved field in the haptic structure. This saves 1 ↵Purdea Andrei2021-05-081-1/+1
| | | | | | | | | | byte of wasted SRAM. (#12483) Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-098-0/+630
|\|
| * add ttys0's planck and preonic keymaps (#10560)Sean Johnson2021-05-088-0/+630
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Resolve a number of warnings in `qmk generate-api` (#12833)Zach White2021-05-0831-44/+42
| |
* | fix some references to bin/qmk that slipped in (#12832)Zach White2021-05-083-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-0816-224/+604
|\|
| * Update sethBarberee Userspace (#12620)Seth Barberee2021-05-0816-224/+604
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-082-38/+40
|\|
| * Hbbisenieks keymap update to remove kc_ keymaps (#12391)Hilary B. Brenum2021-05-082-38/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Added OLED fade out support (#12086)Barabas2021-05-083-2/+29
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-071-16/+4
|\|
| * Update FreeBSD install method (#12815)Mateusz Piotrowski2021-05-071-16/+4
| | | | | | | | | | | | | | | | 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/
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-072-0/+51
|\|
| * [Keymap] My Arisu layout setup (#12647)stanrc852021-05-072-0/+51
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-061-7/+7
|\|
| * Fix DZ60 64 key layout (#12551)kb-elmo2021-05-061-7/+7
| | | | | | | | | | | | | | | | * add gk64 layout * Apply suggestions from code review * fix dz60 gk64 layout
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-061-0/+17
|\|
| * Add docs on multiple encoders sharing pins (#11678)timothynsheehan2021-05-061-0/+17
| | | | | | Added explanation of how multiple encoders can share pins and the limitations of this configuration
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-061-3/+20
|\|
| * Add a handful of consumer/gendesk page usages (#12811)Ryan2021-05-061-3/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-051-1/+3
|\|
| * Fix qmk flash on FreeBSD (#12085)Mateusz Piotrowski2021-05-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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").
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-049-0/+240
|\|
| * [Keyboard] ai03 Andromeda (#12676)Andrew Kannan2021-05-049-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-0418-0/+696
|\|
| * [Keyboard] added Time 80 Reforged by Fox Lab (#11996)Matrix Zou2021-05-0418-0/+696
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-045-241/+67
|\|
| * Update noroadsleft userspace and keymaps (2021-05-03) (#12796)James Young2021-05-035-241/+67
| | | | | | | | | | | | | | | | | | | | | | * 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
* | Fix comment parsing (#12750)Zach White2021-05-032-2/+2
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-023-0/+24
|\|
| * Shim cli to new keyboard script (#12780)Joel Challis2021-05-023-0/+24
| | | | | | | | | | | | | | * Shim cli to new keyboard script * Shim cli to new keyboard script * Add docs
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 15:36:22 +0000