summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* 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-081-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-087-171/+151
|\|
| * Update sethBarberee Userspace (#12620)Seth Barberee2021-05-087-171/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | 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-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-044-237/+63
|\|
| * Update noroadsleft userspace and keymaps (2021-05-03) (#12796)James Young2021-05-034-237/+63
| | | | | | | | | | | | | | | | | | | | | | * 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-031-1/+1
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-012-34/+0
|\|
| * Allow <keyboard>.h to be optional when going data driven (#12706)Joel Challis2021-05-012-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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-292-6/+0
|\|
| * Fix F13 LED issue for WT75-B, WT75-C (#12729)Wilba2021-04-292-6/+0
| |
* | Change RGB/LED Matrix to use a simple define for USB suspend (#12697)Drashna Jaelre2021-04-292-32/+30
| |
* | 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
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-281-0/+2
|\|
| * add default folder to standard (#12712)Xelus222021-04-281-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-271-0/+3
|\|
| * YMDK Wings: Update config.h (#12718)alittlepeace2021-04-271-0/+3
| | | | | | Adds Caps Lock LED indicator configuration.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-271-1/+11
|\|
| * Add flashing instructions to GMMK Pro readme (#12719)James Young2021-04-271-1/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-274-0/+133
|\|
| * GMMK Pro: Fixed Bootmagic Lite support; personal keymap; VIA support (#12554)W. Ducky2021-04-274-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2711-0/+965
|\|
| * Add Draculad keyboard (#12604)Mango The Fourth2021-04-2711-0/+965
| | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-272-3/+20
|\|
| * GMMK Pro: add RESET binding, fix layout macro bug (#12684)Ryan Mitchell2021-04-272-3/+20
| | | | | | | | | | * add RESET binding, fix layout mod key bug (fixes #12683) * remove underscore #define and use core's instead
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-279-424/+198
|\|
| * Update noroadsleft userspace and keymaps (2021-04-26) (#12711)James Young2021-04-269-424/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update noroadsleft userspace and keymaps (2021-04-26) - add Discipline keymap - move Emulated Non-US Backslash, Numeric Keypad and F13-F24 code fully to userspace - re-add some custom keycode handling I accidentally deleted - update VRSN keycode - update KC60 and userspace readmes * remove Git readme from kc60 keymap * update kc60:noroadsleft readme Concatenates this readme into one file, and updates the image links.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-261-0/+3
|\|
| * [Keyboard] fix planck light via endpoints (#12701)Xelus222021-04-261-0/+3
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 21:41:31 +0000