summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-021-1/+1
|\|
| * Fix unused import in recent generation code (#12781)Joel Challis2021-05-021-1/+1
| |
* | [CI] Format code according to conventions (#12772)github-actions[bot]2021-05-021-1/+1
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Fixing transport's led/rgb matrix suspend state logic (#12770)XScorpion22021-05-011-8/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-015-35/+66
|\|
| * Allow <keyboard>.h to be optional when going data driven (#12706)Joel Challis2021-05-015-35/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-301-1/+1
|\|
| * [Keyboard] Fix bootloader rule for meishi2 keyboard (#12740)k.bigwheel2021-05-011-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-3032-2/+955
|\|
| * Add breeze variants (#12596)David Fryer2021-04-3032-2/+955
| | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-295-68/+136
|\|
| * DracuLad: add Configurator data and rework layout macro (#12727)James Young2021-04-295-68/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2920-0/+655
|\|
| * Add firmware for CozyKeys Bloomer keyboard (#12639)Paul Ewing2021-04-2920-0/+655
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-291-0/+2
|\|
| * Align drivers.txt with toolbox (#12741)Joel Challis2021-04-301-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-292-6/+0
|\|
| * Fix F13 LED issue for WT75-B, WT75-C (#12729)Wilba2021-04-292-6/+0
| |
* | [CI] Format code according to conventions (#12731)github-actions[bot]2021-04-294-16/+14
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Change RGB/LED Matrix to use a simple define for USB suspend (#12697)Drashna Jaelre2021-04-299-53/+62
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-281-1/+1
|\|
| * Fix up bad keycode in #12405. (#12722)Nick Brassel2021-04-281-1/+1
| |
* | Fix bad PR merge for #6580. (#12721)Nick Brassel2021-04-281-2/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-281-0/+2
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 10:52:02 +0000