summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-109-0/+329
|\
| * [Keyboard] Element Hotswap PCB (#15082)MechMerlin2021-11-109-0/+329
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-109-0/+227
|\|
| * [Keyboard] Teleport numpad (#14905)Moritz2021-11-109-0/+227
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-1011-62/+693
|\|
| * Updates to drashna keymap and minor updates to tractyl manuform (#15101)Drashna Jaelre2021-11-1011-62/+693
| |
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-11-095-9/+14
|\|
| * Update noroadsleft userspace and keymaps (2021-11-09) (#15099)James Young2021-11-095-10/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-085-51/+163
|\|
| * Mechlovin Pisces Refactor (#15080)James Young2021-11-075-51/+163
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-064-78/+555
|\|
| * idb 60 Layout Macro Refactor (#15079)James Young2021-11-064-78/+555
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * alias LAYOUT to LAYOUT_all * move layout alias to info.json * use XXX for KC_NO in idb_60.h * remove newline characters from info.json labels * put LAYOUT_all data first in info.json Matches the order of idb_60.h. * friendly-format info.json * add matrix diagram to idb_60.h * rename LAYOUT_default to LAYOUT_60_ansi_wkl_split_rshift * add LAYOUT_60_tsangan_hhkb * add LAYOUT_60_ansi_tsangan * add LAYOUT_60_iso_tsangan * add LAYOUT_60_iso_wkl_split_rshift * add LAYOUT_60_iso_tsangan_hhkb * edit Backspace label for LAYOUT_60_ansi_wkl_split_rshift * use GitHub username in info.json maintainer field
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-069-0/+883
|\|
| * [Keyboard] Add new keyboard "Heavy Left" (#15052)takashicompany2021-11-069-0/+883
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Fixup broken build after #15040 (#15073)Sergey Vlasov2021-11-066-3/+3
| | | | | | Rename keyboard files after moving them into revision directories.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-062-0/+45
|\|
| * [Keyboard] Add VIA to Gud70 (#15071)Evelien Dekkers2021-11-052-0/+45
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-051-0/+1
|\|
| * [Keyboard] Fix compilation issues for superuser tkl (#15070)Drashna Jaelre2021-11-051-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-0510-0/+728
|\|
| * [Keyboard] Add Ziggurat keyboard (#15008)kb-elmo2021-11-0510-0/+728
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-053-0/+60
|\|
| * [Keymap] add keymap for xd60 (#15053)mizuhof2021-11-053-0/+60
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Update updated KPrepublic boards to be prepared for the update (#15040)peepeetee2021-11-0519-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-052-243/+47
|\|
| * [Keymap] Revamp the ergodox french_hacker layout (#15064)kototama2021-11-052-243/+47
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-055-3/+162
|\|
| * kprepublic/bm65rgb/rev1: Fix info.json (#15066)Sergey Vlasov2021-11-051-3/+7
| |
| * [Keymap][GMMK Pro] Add personal profile (#15069)Cory Ginsberg2021-11-054-0/+155
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Cory Ginsberg <coryginsberg@fb.com>
* | [Keyboard] Fix compilation issues for yanghu Unicorne (#15068)Drashna Jaelre2021-11-051-7/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-055-23/+588
|\|
| * Superuser TKL Layout Macro Refactor (#15048)James Young2021-11-055-23/+588
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename LAYOUT_tkl to LAYOUT_all * friendly-format info.json * use K<row><column> notation in tkl.h * add matrix diagram to tkl.h * add LAYOUT_tkl_ansi_tsangan * add LAYOUT_tkl_ansi_tsangan_split_bs_rshift * add LAYOUT_tkl_iso_tsangan * add LAYOUT_tkl_iso_tsangan_split_bs_rshift * correct keyboard maintainer values
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-055-21/+542
|\|
| * Superuser EXT Layout Macro Refactor (#15043)James Young2021-11-055-21/+542
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix info.json macro reference * rename LAYOUT_tkl to LAYOUT_all * use K<row><column> notation in ext.h * add matrix diagram to ext.h * friendly-format info.json * add LAYOUT_ansi * add LAYOUT_ansi_split_bs_rshift * add LAYOUT_iso * add LAYOUT_iso_split_bs_rshift * correct keyboard maintainer values
* | Fix parallel builds w/ LTO on systems where make is not GNU make. (#13955)uqs2021-11-051-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-051-5/+18
|\|
| * Improve Sweep keyboard readme documentation (#15038)Albert Y2021-11-051-5/+18
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-052-15/+26
|\|
| * Add toolbox handedness instructions for Cradio (#15046)Albert Y2021-11-051-5/+9
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * Improve handedness documentation for Architeuthis Dux (#15051)Albert Y2021-11-051-10/+17
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-053-12/+255
|\|
| * Mechlovin Infinity88 Layout Extension (#15058)James Young2021-11-053-12/+255
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-0516-0/+908
|\|
| * Add a new keyboard "Unicorne" (#12993)Yang Hu2021-11-0516-0/+908
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add keyboards/yanghu/unicorne initial files. * add default keymap to yanghu/unicorne * use slow i2c and enable internal pullup resistor * add oled to default keymaps * fix unicorne default keymap * fix encoder pad direction * fix marauder * add led matrix configs. * add encoder code to default keymap. * fix encoder direction * add readme, info.json and update copyright for c files. * fix build error by clean up include in unicorne.c * fix images in readme files * Fix various issues in PR #12993 feedback. * Added copyright in glcdfont, fix include in that file. * Removed `_kc` layout and renamed layout with generic style. * Moved capslock oled update to oled.c inside `oled_task_user()`. * Update keyboards/yanghu/unicorne/keymaps/default/rules.mk Always include oled.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/oled.c Wrap `oled.c` with ifdef. Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/oled.c Co-authored-by: Drashna Jaelre <drashna@live.com> * move oled code to unicorne.c, and set weakly. * Update keyboards/yanghu/unicorne/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/unicorne.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/keymaps/default/oled.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/f411/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * remove oled.h * remove include of oled.h after the file is deleted. * Apply suggestions from code review: remove redundant macros and reformat. Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggestions from code review: change OLED driver macro. Use `OLED_ENABLE` instead of `OLED_DRIVER_ENABLE`. Co-authored-by: Jonathan Rascher <jon@bcat.name> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonathan Rascher <jon@bcat.name>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-058-0/+572
|\|
| * My Personal Keymaps for the Planck and melody96 (#12672)devilzmods2021-11-058-0/+572
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * my planck keymap * my planck keymap * minor changes * Added personalized, VIA compatible keymap to the Melody96 * lighting layers added and keymap tweaked * added basic descriptions * added basic descriptions * added basic descriptions * added basic descriptions * hopefully removed personal change to .gitignore * restored .gitignore from my master * restored .gitignore from my master * requested changes and minor functionality tweaks * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-051-0/+10
|\|
| * Add example for turning off RGB colors and retaining indicator function (#14997)Albert Y2021-11-051-0/+10
| | | | | | | | | | | | | | * Add init function for solid effect with colors off * Restructure sentence Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-051-181/+160
|\|
| * Rework ISP flashing guide (#14938)Ryan2021-11-051-181/+160
| | | | | | | | Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>